zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation.

Browse source
This commit is contained in:
Christoph Oelckers 2020-03-20 21:26:28 +01:00
parent da1d97ba9c
commit fca147c83b
6 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/CMakeLists.txt
View file

@ -654,7 +654,6 @@ set (PCH_SOURCES
thirdparty/src/base64.cpp thirdparty/src/base64.cpp
thirdparty/src/fix16.cpp thirdparty/src/fix16.cpp
thirdparty/src/fix16_str.cpp
thirdparty/src/md4.cpp thirdparty/src/md4.cpp
thirdparty/src/enet.cpp thirdparty/src/enet.cpp
#thirdparty/imgui/imgui.cpp #thirdparty/imgui/imgui.cpp

5
source/duke3d/CMakeLists.txt
View file

@ -1,8 +1,4 @@
set( NOT_COMPILED_SOURCE_FILES
src/gamestructures.cpp
)
set( PCH_SOURCES set( PCH_SOURCES
src/actors.cpp src/actors.cpp
src/anim.cpp src/anim.cpp
@ -14,6 +10,7 @@ set( PCH_SOURCES
src/game.cpp src/game.cpp
src/gamedef.cpp src/gamedef.cpp
src/gameexec.cpp src/gameexec.cpp
src/gamestructures.cpp
src/gamevars.cpp src/gamevars.cpp
src/global.cpp src/global.cpp
src/namesdyn.cpp src/namesdyn.cpp

2
source/duke3d/src/gameexec.cpp
View file

@ -25,11 +25,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "anim.h" #include "anim.h"
#include "cmdline.h" #include "cmdline.h"
#include "imagehelpers.h" #include "imagehelpers.h"
#include "communityapi.h"
#include "compat.h" #include "compat.h"
#include "duke3d.h" #include "duke3d.h"
#include "gamestructures.h" #include "gamestructures.h"
#include "input.h"
#include "menus.h" #include "menus.h"
#include "osdcmds.h" #include "osdcmds.h"
#include "savegame.h" #include "savegame.h"

7
source/duke3d/src/gamestructures.cpp
View file

@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#include "ns.h"
#include "gamestructures.h" #include "gamestructures.h"
#include "compat.h" #include "compat.h"
@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "gameexec.h" #include "gameexec.h"
#include "global.h" #include "global.h"
BEGIN_DUKE_NS
#define LABEL_SETUP_UNMATCHED(struct, memb, name, idx) \ #define LABEL_SETUP_UNMATCHED(struct, memb, name, idx) \
{ \ { \
name, idx, sizeof(struct[0].memb) | (is_unsigned<decltype(struct[0].memb)>::value ? LABEL_UNSIGNED : 0), 0, \ name, idx, sizeof(struct[0].memb) | (is_unsigned<decltype(struct[0].memb)>::value ? LABEL_UNSIGNED : 0), 0, \
@ -1949,5 +1951,6 @@ void VM_InitHashTables(void)
STRUCT_HASH_SETUP(h_userdef, UserdefsLabels); STRUCT_HASH_SETUP(h_userdef, UserdefsLabels);
STRUCT_HASH_SETUP(h_wall, WallLabels); STRUCT_HASH_SETUP(h_wall, WallLabels);
} }
#undef STRUCT_HASH_SETUP //#undef STRUCT_HASH_SETUP
END_DUKE_NS

9
source/duke3d/src/gamestructures.h
View file

@ -27,9 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "compat.h" #include "compat.h"
#include "hash.h" #include "hash.h"
#ifdef __cplusplus BEGIN_DUKE_NS
extern "C" {
#endif
int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2); int32_t __fastcall VM_GetUserdef(int32_t labelNum, int const lParm2);
void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t const newValue); void __fastcall VM_SetUserdef(int const labelNum, int const lParm2, int32_t const newValue);
@ -87,8 +85,7 @@ static hashtable_t *const vmStructHashTablePtrs[] = {
&h_actor, &h_input, &h_paldata, &h_player, &h_projectile, &h_sector, &h_tiledata, &h_tsprite, &h_userdef, &h_wall, &h_actor, &h_input, &h_paldata, &h_player, &h_projectile, &h_sector, &h_tiledata, &h_tsprite, &h_userdef, &h_wall,
}; };
#ifdef __cplusplus END_DUKE_NS
}
#endif
#endif // gamestructures_h__ #endif // gamestructures_h__

2
source/duke3d/src/gamevars.cpp
View file

@ -27,9 +27,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "savegame.h" #include "savegame.h"
#include "gamecvars.h" #include "gamecvars.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "gamestructures.h"
BEGIN_DUKE_NS BEGIN_DUKE_NS
#include "gamestructures.h"
#ifdef LUNATIC #ifdef LUNATIC
int32_t g_noResetVars; int32_t g_noResetVars;