Fix linux compilation.

Fix windows compilation, again.
This commit is contained in:
Giegue
2023-02-14 20:44:13 -03:00
parent c32827b4cb
commit 2f80da1e15
3 changed files with 18 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
CPP = g++-7 CPP = g++
BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -m32 BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -m32
OPTFLAGS = -O2 OPTFLAGS = -O2
CPPFLAGS = ${BASEFLAGS} ${OPTFLAGS} -w -I. -I../engine -I../common -I../pm_shared -I../metamod CPPFLAGS = ${BASEFLAGS} ${OPTFLAGS} -w -I. -I../engine -I../common -I../pm_shared -I../metamod
@@ -17,18 +17,20 @@ OBJ = \
controller.o \ controller.o \
defaultai.o \ defaultai.o \
dllapi.o \ dllapi.o \
explode.o \
effects.o \ effects.o \
explode.o \
flyingmonster.o \
gargantua.o \ gargantua.o \
gonome.o \
ggrenade.o \ ggrenade.o \
gonome.o \
h_ai.o \ h_ai.o \
h_export.o \
hassassin.o \ hassassin.o \
headcrab.o \ headcrab.o \
h_export.o \
hgrunt.o \ hgrunt.o \
hornet.o \ hornet.o \
houndeye.o \ houndeye.o \
hwgrunt.o \
islave.o \ islave.o \
massn.o \ massn.o \
monster_api.o \ monster_api.o \
@@ -38,6 +40,7 @@ OBJ = \
nodes.o \ nodes.o \
otis.o \ otis.o \
pitdrone.o \ pitdrone.o \
rgrunt.o \
scientist.o \ scientist.o \
shock.o \ shock.o \
shockroach.o \ shockroach.o \
@@ -46,6 +49,7 @@ OBJ = \
sporegrenade.o \ sporegrenade.o \
squeakgrenade.o \ squeakgrenade.o \
strooper.o \ strooper.o \
stukabat.o \
subs.o \ subs.o \
talkmonster.o \ talkmonster.o \
turret.o \ turret.o \

View File

@@ -37,7 +37,13 @@
#ifndef ENGINE_API_H #ifndef ENGINE_API_H
#define ENGINE_API_H #define ENGINE_API_H
#include <stdint.h> // why? // No proper C99 support in old MVSC6, use custom stdint.h
#ifdef _WIN32
#include "stdint_c99.h"
#else
#include <stdint.h>
#endif
#include "comp_dep.h" #include "comp_dep.h"
// Plugin's GetEngineFunctions, called by metamod. // Plugin's GetEngineFunctions, called by metamod.

View File

@@ -80,7 +80,9 @@
// DLL. // DLL.
#undef DLLEXPORT #undef DLLEXPORT
#ifdef _WIN32 #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. // WINAPI should be provided in the windows compiler headers.
// It's usually defined to something like "__stdcall". // It's usually defined to something like "__stdcall".
#elif defined(linux) #elif defined(linux)