zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sjson its own object

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8091 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-09-10 23:34:46 +00:00 committed by Christoph Oelckers
parent e3f1399484
commit 475743424f
7 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
GNUmakefile
View file

@ -258,6 +258,7 @@ engine_objs := \
miniz_tdef.c \ miniz_tdef.c \
fix16.cpp \ fix16.cpp \
fix16_str.cpp \ fix16_str.cpp \
sjson.cpp \
engine_editor_objs := \ engine_editor_objs := \
build.cpp \ build.cpp \

1
platform/Windows/build.vcxproj
View file

@ -275,6 +275,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\build\src\sjson.cpp" />
<ClCompile Include="..\..\source\build\src\smalltextfont.cpp" /> <ClCompile Include="..\..\source\build\src\smalltextfont.cpp" />
<ClCompile Include="..\..\source\build\src\softsurface.cpp" /> <ClCompile Include="..\..\source\build\src\softsurface.cpp" />
<ClCompile Include="..\..\source\build\src\texcache.cpp" /> <ClCompile Include="..\..\source\build\src\texcache.cpp" />

3
platform/Windows/build.vcxproj.filters
View file

@ -146,6 +146,9 @@
<ClCompile Include="..\..\source\build\src\sdlkeytrans.cpp"> <ClCompile Include="..\..\source\build\src\sdlkeytrans.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\source\build\src\sjson.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\source\build\src\smalltextfont.cpp"> <ClCompile Include="..\..\source\build\src\smalltextfont.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>

3
platform/Windows/msvc.mak
View file

@ -192,7 +192,8 @@ ENGINE_OBJS= \
$(ENGINE_OBJ)\miniz_tinfl.$o \ $(ENGINE_OBJ)\miniz_tinfl.$o \
$(ENGINE_OBJ)\miniz_tdef.$o \ $(ENGINE_OBJ)\miniz_tdef.$o \
$(ENGINE_OBJ)\fix16.$o \ $(ENGINE_OBJ)\fix16.$o \
$(ENGINE_OBJ)\fix16_str.$o $(ENGINE_OBJ)\fix16_str.$o \
$(ENGINE_OBJ)\sjson.$o \
ENGINE_EDITOR_OBJS=$(ENGINE_OBJ)\build.$o \ ENGINE_EDITOR_OBJS=$(ENGINE_OBJ)\build.$o \

5
source/build/src/sjson.cpp Normal file
View file

@ -0,0 +1,5 @@
#include "compat.h"
#define SJSON_IMPLEMENT
#include "sjson.h"

1
source/duke3d/src/player.cpp
View file

@ -5657,7 +5657,6 @@ HORIZONLY:;
} }
#define SJSON_IMPLEMENT
#include "sjson.h" #include "sjson.h"
int portableBackupSave(const char * path, const char * name, int volume, int level) int portableBackupSave(const char * path, const char * name, int volume, int level)

6
source/thirdparty/include/sjson.h vendored
View file

@ -324,9 +324,9 @@ bool sjson_check(const sjson_node* node, char errmsg[256]);
#ifndef sjson_malloc #ifndef sjson_malloc
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
# define sjson_malloc(user, size) (UNREFERENCED_PARAMETER(user), malloc(size)) # define sjson_malloc(user, size) ((UNREFERENCED_PARAMETER(user)), malloc(size))
# define sjson_free(user, ptr) (UNREFERENCED_PARAMETER(user), free(ptr)) # define sjson_free(user, ptr) ((UNREFERENCED_PARAMETER(user)), free(ptr))
# define sjson_realloc(user, ptr, size) (UNREFERENCED_PARAMETER(user), realloc(ptr, size)) # define sjson_realloc(user, ptr, size) ((UNREFERENCED_PARAMETER(user)), realloc(ptr, size))
#endif #endif
#ifndef sjson_assert #ifndef sjson_assert