TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mac compile fixes

Browse source 
1) `/` not `\` for includes
2) had to clean up a few extra ## bits that work fine winside, but trip up macs (only needed when stitching, had 5 spots where that was pointless)
This commit is contained in:
AzaezelX 2020-11-06 02:11:13 -06:00
parent e3b8c7b001
commit 5de19404d9
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/assets/ImageAsset.h
View file

@ -178,7 +178,7 @@ public:
void set##name##Asset(AssetPtr<ImageAsset>_in) { m##name##Asset = _in; }\ void set##name##Asset(AssetPtr<ImageAsset>_in) { m##name##Asset = _in; }\
static bool _set##name##Asset(void* obj, const char* index, const char* data)\ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
{\ {\
##className* mat = static_cast<##className*>(obj);\ className* mat = static_cast<className*>(obj);\
mat->m##name##AssetId = StringTable->insert(data);\ mat->m##name##AssetId = StringTable->insert(data);\
if (ImageAsset::getAssetById(mat->m##name##AssetId, &mat->m##name##Asset))\ if (ImageAsset::getAssetById(mat->m##name##AssetId, &mat->m##name##Asset))\
{\ {\
@ -199,10 +199,10 @@ static bool _set##name##Asset(void* obj, const char* index, const char* data)\
AssetPtr<ImageAsset> m##name##Asset[max];\ AssetPtr<ImageAsset> m##name##Asset[max];\
static bool _set##name##AssetSlot(void* obj, const char* index, const char* data)\ static bool _set##name##AssetSlot(void* obj, const char* index, const char* data)\
{\ {\
##className* mat = static_cast<##className*>(obj);\ className* mat = static_cast<className*>(obj);\
if (!index) return false;\ if (!index) return false;\
U32 idx = dAtoi(index);\ U32 idx = dAtoi(index);\
if (idx >= ##max)\ if (idx >= max)\
return false;\ return false;\
mat->m##name##AssetId[idx] = StringTable->insert(data);\ mat->m##name##AssetId[idx] = StringTable->insert(data);\
if (ImageAsset::getAssetById(mat->m##name##AssetId[idx], &mat->m##name##Asset[idx]))\ if (ImageAsset::getAssetById(mat->m##name##AssetId[idx], &mat->m##name##Asset[idx]))\

2
Engine/source/T3D/notesObject.cpp
View file

@ -7,7 +7,7 @@
#include "gfx/gfxDebugEvent.h" #include "gfx/gfxDebugEvent.h"
#include "gfx/gfxTransformSaver.h" #include "gfx/gfxTransformSaver.h"
#include "renderInstance/renderPassManager.h" #include "renderInstance/renderPassManager.h"
#include "math\mathUtils.h" #include "math/mathUtils.h"
#include "gfx/gfxDrawUtil.h" #include "gfx/gfxDrawUtil.h"
IMPLEMENT_CO_NETOBJECT_V1(NotesObject); IMPLEMENT_CO_NETOBJECT_V1(NotesObject);