diff --git a/src/dlls/Makefile b/src/dlls/Makefile index eec103d..3113bc1 100644 --- a/src/dlls/Makefile +++ b/src/dlls/Makefile @@ -1,4 +1,4 @@ -CPP = g++-7 +CPP = g++ BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -m32 OPTFLAGS = -O2 CPPFLAGS = ${BASEFLAGS} ${OPTFLAGS} -w -I. -I../engine -I../common -I../pm_shared -I../metamod @@ -17,18 +17,20 @@ OBJ = \ controller.o \ defaultai.o \ dllapi.o \ - explode.o \ effects.o \ + explode.o \ + flyingmonster.o \ gargantua.o \ - gonome.o \ ggrenade.o \ + gonome.o \ h_ai.o \ - h_export.o \ hassassin.o \ headcrab.o \ + h_export.o \ hgrunt.o \ hornet.o \ houndeye.o \ + hwgrunt.o \ islave.o \ massn.o \ monster_api.o \ @@ -38,6 +40,7 @@ OBJ = \ nodes.o \ otis.o \ pitdrone.o \ + rgrunt.o \ scientist.o \ shock.o \ shockroach.o \ @@ -46,6 +49,7 @@ OBJ = \ sporegrenade.o \ squeakgrenade.o \ strooper.o \ + stukabat.o \ subs.o \ talkmonster.o \ turret.o \ diff --git a/src/metamod/engine_api.h b/src/metamod/engine_api.h index 2a3bce7..c823530 100644 --- a/src/metamod/engine_api.h +++ b/src/metamod/engine_api.h @@ -37,7 +37,13 @@ #ifndef ENGINE_API_H #define ENGINE_API_H -#include // why? +// No proper C99 support in old MVSC6, use custom stdint.h +#ifdef _WIN32 +#include "stdint_c99.h" +#else +#include +#endif + #include "comp_dep.h" // Plugin's GetEngineFunctions, called by metamod. diff --git a/src/metamod/osdep.h b/src/metamod/osdep.h index 49019fd..4699b90 100644 --- a/src/metamod/osdep.h +++ b/src/metamod/osdep.h @@ -80,7 +80,9 @@ // DLL. #undef DLLEXPORT #ifdef _WIN32 - #define DLLEXPORT __declspec(dllexport) __attribute__ ((externally_visible)) + // __attribute__ ((externally_visible)) is not recognized by VC++6 + // or, rather, is GCC-only. do we need it for windows builds? -Giegue + #define DLLEXPORT __declspec(dllexport) // WINAPI should be provided in the windows compiler headers. // It's usually defined to something like "__stdcall". #elif defined(linux)