Attempt at fixing windows build errors.
Attempt at fixing windows build errors.
1.1 --- a/loader/gamedll.cpp Sun Nov 23 22:05:58 2008 -0600
1.2 +++ b/loader/gamedll.cpp Sun Nov 23 22:10:16 2008 -0600
1.3 @@ -11,6 +11,8 @@
1.4 #include "gamedll.h"
1.5 #include "valve_commandline.h"
1.6
1.7 +#undef GetCommandLine
1.8 +
1.9 class IServerGameDLL;
1.10 typedef ICommandLine *(*GetCommandLine)();
1.11
2.1 --- a/loader/loader.cpp Sun Nov 23 22:05:58 2008 -0600
2.2 +++ b/loader/loader.cpp Sun Nov 23 22:10:16 2008 -0600
2.3 @@ -52,22 +52,6 @@
2.4 #define LIBRARY_MINEXT ".so"
2.5 #endif
2.6
2.7 -#if defined _WIN32
2.8 -void
2.9 -mm_GetPlatformError(char *buffer, size_t maxlength)
2.10 -{
2.11 - DWORD dw = GetLastError();
2.12 - FormatMessageA(
2.13 - FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
2.14 - NULL,
2.15 - dw,
2.16 - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
2.17 - (LPSTR)buffer,
2.18 - maxlength,
2.19 - NULL);
2.20 -}
2.21 -#endif
2.22 -
2.23 bool
2.24 mm_LoadMetamodLibrary(MetamodBackend backend, char *buffer, size_t maxlength)
2.25 {
3.1 --- a/loader/utility.cpp Sun Nov 23 22:05:58 2008 -0600
3.2 +++ b/loader/utility.cpp Sun Nov 23 22:10:16 2008 -0600
3.3 @@ -7,6 +7,23 @@
3.4 #include "loader.h"
3.5 #include "utility.h"
3.6
3.7 +#if defined _WIN32
3.8 +static void
3.9 +mm_GetPlatformError(char *buffer, size_t maxlength)
3.10 +{
3.11 + DWORD dw = GetLastError();
3.12 + FormatMessageA(
3.13 + FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
3.14 + NULL,
3.15 + dw,
3.16 + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
3.17 + (LPSTR)buffer,
3.18 + maxlength,
3.19 + NULL);
3.20 +}
3.21 +#endif
3.22 +
3.23 +
3.24 size_t
3.25 mm_FormatArgs(char *buffer, size_t maxlength, const char *fmt, va_list params)
3.26 {
3.27 @@ -238,7 +255,7 @@
3.28 void *lib;
3.29
3.30 #if defined _WIN32
3.31 - lib = LoadLibrary(path);
3.32 + lib = (void*)LoadLibrary(path);
3.33
3.34 if (lib == NULL)
3.35 {
3.36 @@ -262,7 +279,7 @@
3.37 mm_GetLibAddress(void *lib, const char *name)
3.38 {
3.39 #if defined _WIN32
3.40 - return GetProcAddress(lib, name);
3.41 + return GetProcAddress((HMODULE)lib, name);
3.42 #elif defined __linux__
3.43 return dlsym(lib, name);
3.44 #endif
3.45 @@ -272,7 +289,7 @@
3.46 mm_UnloadLibrary(void *lib)
3.47 {
3.48 #if defined _WIN32
3.49 - FreeLibrary(lib);
3.50 + FreeLibrary((HMODULE)lib);
3.51 #else
3.52 dlclose(lib);
3.53 #endif