From 24610a2a1074900dcf0cb6894502874e5762e97a Mon Sep 17 00:00:00 2001 From: Pavol Marko Date: Sun, 7 Mar 2004 19:30:04 +0000 Subject: [PATCH] Fixed GiveFnPtrsToDll linux problem --- dlls/fun/Makefile | 2 +- dlls/fun/fun.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index e7c87196..4a7050c3 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -57,7 +57,7 @@ OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o) CCOPT = -march=i586 -O6 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ - -malign-jumps=2 -malign-functions=2 -s -DNDEBUG + -malign-jumps=2 -malign-functions=2 -s -DNDEBUG -lstdc++ INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(AMXDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS) CFLAGS=-Wall -Wno-unknown-pragmas diff --git a/dlls/fun/fun.cpp b/dlls/fun/fun.cpp index a96b57ca..9d4597dd 100755 --- a/dlls/fun/fun.cpp +++ b/dlls/fun/fun.cpp @@ -795,7 +795,11 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason) { } } +#ifdef __linux__ +C_DLLEXPORT void GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals ) { +#else void WINAPI GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals ) { +#endif memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t)); gpGlobals = pGlobals; }