From b45d86b603591174a4b9f5c9e8fd4910ef9751c9 Mon Sep 17 00:00:00 2001 From: Walter Julius Hennecke Date: Tue, 6 Dec 2011 00:36:06 +0100 Subject: [PATCH] Continued work on client lua support --- cgame/cg_lua.c | 18 ++++++++++++++++++ cgame/cgame.vcxproj | 1 + stefgame.suo | Bin 209920 -> 209920 bytes 3 files changed, 19 insertions(+) diff --git a/cgame/cg_lua.c b/cgame/cg_lua.c index d7f88df..4f4a301 100644 --- a/cgame/cg_lua.c +++ b/cgame/cg_lua.c @@ -4,6 +4,12 @@ #ifdef G_LUA +#if defined(__linux__) || defined(__WIN32__) || defined(__APPLE__) || 1 /* linux, mingw32, OS X - the 1 is temporary*/ +#include /* Note the MSVC project assumes mingw is installed at C:\MinGW\include */ +#else // MSVC +// TODO: I don't care much about MSVC as I user mingw on Windows to compile :P +#endif + lvm_t *lVM[NUM_VMS]; fileHandle_t lualog; @@ -99,9 +105,21 @@ qboolean LoadLuaFile(char *path, int num_vm) qboolean CG_LuaInit() { + #if defined(__linux__) || defined(__WIN32__) || defined(__APPLE__) || 1 /* linux, mingw32, OS X - the 1 is temporary*/ + DIR *pdir = NULL; + struct dirent *pent = NULL; + #else // MSVC + + #endif CG_Printf("------- CG_LuaInit -------\n"); + #if defined(__linux__) || defined(__WIN32__) || defined(__APPLE__) || 1 /* linux, mingw32, OS X - the 1 is temporary*/ + + #else // MSVC + + #endif + // not much to do for now if(cg_logLua.integer) { trap_FS_FOpenFile("./cg_lua.log", &lualog, FS_APPEND); diff --git a/cgame/cgame.vcxproj b/cgame/cgame.vcxproj index 319b2de..c4a6d38 100644 --- a/cgame/cgame.vcxproj +++ b/cgame/cgame.vcxproj @@ -48,6 +48,7 @@ AllRules.ruleset + C:\MinGW\include;$(IncludePath) diff --git a/stefgame.suo b/stefgame.suo index 53f07965660362d7e4bb649427b75dbd4d42a7d8..5a07a27bc5b340af37a7f1df181d4888a7f16ae6 100644 GIT binary patch delta 4516 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 LG>PrS{N4WnPJE*o delta 4858 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