mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-06-04 19:32:56 +00:00
fix iggy includes
This commit is contained in:
parent
b7d200a5b1
commit
50f6bf8e68
|
|
@ -13,11 +13,6 @@
|
|||
#include "platform/storage/storage.h"
|
||||
#include "util/StringHelpers.h"
|
||||
|
||||
#if defined(_WINDOWS64)
|
||||
#include "app/windows/XML/ATGXmlParser.h"
|
||||
#include "app/windows/XML/xmlFilesCallback.h"
|
||||
#endif
|
||||
|
||||
namespace {
|
||||
constexpr std::size_t AUDIO_DLC_WCHAR_BIN_SIZE = 2;
|
||||
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ int32_t DLCController::registerDLCData(char* pType, char* pBannerName,
|
|||
pDLCData->uiSortIndex = uiSortIndex;
|
||||
pDLCData->iConfig = iConfig;
|
||||
|
||||
if (pBannerName != "") {
|
||||
if (strcmp(!pBannerName, "") != 0) {
|
||||
strncpy(pDLCData->wchBanner, pBannerName, MAX_BANNERNAME_SIZE);
|
||||
}
|
||||
if (pDataFile[0] != 0) {
|
||||
|
|
|
|||
|
|
@ -47,10 +47,6 @@
|
|||
#include "platform/renderer/renderer.h"
|
||||
#include "platform/storage/storage.h"
|
||||
#include "strings.h"
|
||||
#if defined(_WINDOWS64)
|
||||
#include "app/windows/XML/ATGXmlParser.h"
|
||||
#include "app/windows/XML/xmlFilesCallback.h"
|
||||
#endif
|
||||
#include <assert.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -688,7 +688,7 @@ static void gdraw_FramebufferRenderbufferSafe(GLenum target, GLenum attachment,
|
|||
#define glFramebufferRenderbuffer_SAFE gdraw_FramebufferRenderbufferSafe
|
||||
#define glFramebufferRenderbuffer glFramebufferRenderbuffer_SAFE
|
||||
|
||||
#include "app/windows/Iggy/gdraw/gdraw_gl_shared.inl"
|
||||
#include "gdraw_gl_shared.inl"
|
||||
|
||||
#undef glVertexAttribPointer
|
||||
#define glVertexAttribPointer gdraw_real_vtxattrib
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
#define __LINUX_IGGY_GDRAW_H__
|
||||
|
||||
#include "app/common/Iggy/include/rrCore.h"
|
||||
#include "app/windows/Iggy/include/gdraw.h"
|
||||
#include "app/windows/Iggy/include/iggy.h"
|
||||
#include "app/common/Iggy/include/gdraw.h"
|
||||
#include "app/common/Iggy/include/iggy.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
|||
1536
targets/app/common/Iggy/gdraw/gdraw_gl_shaders.inl
Normal file
1536
targets/app/common/Iggy/gdraw/gdraw_gl_shaders.inl
Normal file
File diff suppressed because it is too large
Load diff
2695
targets/app/common/Iggy/gdraw/gdraw_gl_shared.inl
Normal file
2695
targets/app/common/Iggy/gdraw/gdraw_gl_shared.inl
Normal file
File diff suppressed because it is too large
Load diff
2693
targets/app/common/Iggy/gdraw/gdraw_shared.inl
Normal file
2693
targets/app/common/Iggy/gdraw/gdraw_shared.inl
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -126,6 +126,7 @@ typedef enum IggyDatatype {
|
|||
#include <stddef.h>
|
||||
IDOCN typedef char IggyUTF16;
|
||||
#else
|
||||
#include <uchar.h>
|
||||
typedef const char16_t IggyUTF16;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#endif
|
||||
#include "app/common/Iggy/include/rrCore.h"
|
||||
#include "app/common/Game.h"
|
||||
#include "app/windows/Iggy/include/gdraw.h"
|
||||
#include "app/common/Iggy/include/gdraw.h"
|
||||
|
||||
ConsoleUIController ui;
|
||||
|
||||
|
|
|
|||
|
|
@ -58,19 +58,12 @@ class Tutorial;
|
|||
// #define EXCLUDE_IGGY_ALLOCATIONS_FROM_HEAP_INSPECTOR
|
||||
|
||||
// #define ENABLE_IGGY_EXPLORER
|
||||
#if defined(ENABLE_IGGY_EXPLORER)
|
||||
#include "app/windows/Iggy/include/iggyexpruntime.h"
|
||||
#endif
|
||||
|
||||
// #define ENABLE_IGGY_PERFMON
|
||||
#if defined(ENABLE_IGGY_PERFMON)
|
||||
|
||||
#define PM_ORIGIN_X 24
|
||||
#define PM_ORIGIN_Y 34
|
||||
|
||||
#if defined(__WINDOWS64)
|
||||
#include "app/windows/Iggy/include/iggyperfmon.h"
|
||||
#endif
|
||||
#define PM_ORIGIN_
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue