zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move win32 "Initialized nedmalloc" message out of the function that prints the Windows version since it doesn't really belong there. 

git-svn-id: https://svn.eduke32.com/eduke32@3104 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-10-30 16:06:18 +00:00
parent 8b02800260
commit 7bd6d504c7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
polymer/eduke32/build/src/winlayer.c
View File

@ -34,7 +34,9 @@
#include "a.h" #include "a.h"
#include "osd.h" #include "osd.h"
#include "rawinput.h" #include "rawinput.h"
#include "nedmalloc.h" #ifndef DEBUGGINGAIDS
#include "nedmalloc.h"
#endif
#include "mutex.h" #include "mutex.h"
// undefine to restrict windowed resolutions to conventional sizes // undefine to restrict windowed resolutions to conventional sizes
@ -354,9 +356,7 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
if ((nedcreatepool = (void *)GetProcAddress(nedhandle, "nedcreatepool"))) if ((nedcreatepool = (void *)GetProcAddress(nedhandle, "nedcreatepool")))
nedcreatepool(SYSTEM_POOL_SIZE, -1); nedcreatepool(SYSTEM_POOL_SIZE, -1);
} }
#endif #else
#ifdef DEBUGGINGAIDS
LoadLibraryA("ebacktrace1.dll"); LoadLibraryA("ebacktrace1.dll");
/* /*
wm_msgbox("boo","didn't load backtrace DLL (code %d)\n", (int)GetLastError()); wm_msgbox("boo","didn't load backtrace DLL (code %d)\n", (int)GetLastError());
@ -375,7 +375,7 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
return -1; return -1;
} }
// carve up the commandline into more recognizable pieces // carve up the command line into more recognizable pieces
argvbuf = Bstrdup(GetCommandLine()); argvbuf = Bstrdup(GetCommandLine());
_buildargc = 0; _buildargc = 0;
if (argvbuf) if (argvbuf)
@ -585,10 +585,8 @@ static void win_printversion(void)
break; break;
} }
initprintf("Windows %s (build %lu.%lu.%lu) %s", ver, initprintf("Windows %s %s (build %lu.%lu.%lu)\n", ver, osv.szCSDVersion,
osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber, osv.szCSDVersion); osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber);
initprintf(nedhandle ? "\nInitialized nedmalloc\n" : "\n");
} }
@ -641,6 +639,9 @@ int32_t initsystem(void)
win_printversion(); win_printversion();
if (nedhandle)
initprintf("Initialized nedmalloc\n");
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (loadgldriver(getenv("BUILD_GLDRV"))) if (loadgldriver(getenv("BUILD_GLDRV")))
{ {