Merge branch 'master' into gravgun

dlls/extdll.h

@@ -59,14 +59,14 @@ typedef int BOOL;
 #define MAX_PATH PATH_MAX
 #include <limits.h>
 #include <stdarg.h>
+#endif //_WIN32
 #ifndef min
 #define min(a,b)  (((a) < (b)) ? (a) : (b))
 #endif
 #ifndef max
 #define max(a,b)  (((a) > (b)) ? (a) : (b))
-#define _vsnprintf(a,b,c,d) vsnprintf(a,b,c,d)
 #endif
-#endif //_WIN32
+
 
 // Misc C-runtime library headers
 #include "stdio.h"

dlls/h_export.cpp

@@ -47,9 +47,13 @@ BOOL WINAPI DllMain(
 	return TRUE;
 }
 
+// stdcall for win32
+#define EXPORT2 WINAPI
+#else
+#define EXPORT2
 #endif
 
-extern "C" void DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
+extern "C" void DLLEXPORT EXPORT2 GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
 {
 	memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
 	gpGlobals = pGlobals;

dlls/nodes.cpp

@@ -40,7 +40,7 @@ CGraph	WorldGraph;
 
 LINK_ENTITY_TO_CLASS( info_node, CNodeEnt );
 LINK_ENTITY_TO_CLASS( info_node_air, CNodeEnt );
-#ifdef _LINUX
+#if defined _LINUX && !defined _WIN32
 #include <unistd.h>
 #include <sys/stat.h>
 #define CreateDirectory(p, n) mkdir(p, 0777)

pm_shared/pm_shared.c

@@ -21,7 +21,7 @@
 #include "pm_shared.h"
 #include "pm_movevars.h"
 #include "pm_debug.h"
-#include <stdio.h>  // NULL
+//#include <stdio.h>  // NULL
 #include <math.h>   // sqrt
 #include <string.h> // strcpy
 #ifdef stricmp