Dunno why this method was static, doesnt need to be...

[user/henk/code/inspircd.git] / win / configure.cpp

diff --git a/win/configure.cpp b/win/configure.cpp
index 890872fddc88c3f69ea1a28049ac06693a51789e..63bf5fd251538147af3e04a1ff3377057d41226a 100644 (file)
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -128,14 +128,6 @@ bad_rev:
 \r
 int __stdcall WinMain(IN HINSTANCE hInstance, IN HINSTANCE hPrevInstance, IN LPSTR lpCmdLine, IN int nShowCmd )\r
 {\r
-       // Skip if configure is already-existant.\r
-       FILE * f = fopen("inspircd_config.h", "r");\r
-       if(f)\r
-       {\r
-               fclose(f);\r
-               return 0;\r
-       }\r
-\r
        AllocConsole();\r
 \r
        // pipe standard handles to this console\r
@@ -368,11 +360,7 @@ void WriteCompileCommands()
     \r
        // Write our spiffy new makefile :D\r
        // I am such a lazy fucker :P\r
-#ifdef _DEBUG\r
        FILE * f = fopen("..\\src\\commands.mak", "w");\r
-#else\r
-       FILE * f = fopen("..\\src\\commands-release.mak", "w");\r
-#endif\r
 \r
        time_t t = time(NULL);\r
        fprintf(f, "# Generated at %s\n", ctime(&t));\r
@@ -385,8 +373,16 @@ void WriteCompileCommands()
        fprintf(f, "\n.cpp.obj:\n");\r
 #ifdef _DEBUG\r
        fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\bin\\debug\\lib\\$*.lib\"\n\n");\r
+       CreateDirectory("..\\src\\debug", NULL);\r
+       CreateDirectory("..\\bin\\debug\\bin", NULL);\r
+       CreateDirectory("..\\bin\\debug\\lib", NULL);\r
+       CreateDirectory("..\\bin\\debug\\modules", NULL);\r
 #else\r
        fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../include\" /I \"../include/modes\" /I \"../include/commands\" /I \"../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\win\\inspircd_memory_functions.cpp /link ..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\bin\\release\\lib\\$*.lib\"\n\n");\r
+       CreateDirectory("..\\src\\release", NULL);\r
+       CreateDirectory("..\\bin\\release\\bin", NULL);\r
+       CreateDirectory("..\\bin\\release\\lib", NULL);\r
+       CreateDirectory("..\\bin\\release\\modules", NULL);\r
 #endif\r
 \r
        fprintf(f, "makedir:\n  if not exist debug mkdir debug\n\n");\r
@@ -424,11 +420,7 @@ void WriteCompileModules()
 \r
        // Write our spiffy new makefile :D\r
        // I am such a lazy fucker :P\r
-#ifdef _DEBUG\r
        FILE * f = fopen("..\\src\\modules\\modules.mak", "w");\r
-#else\r
-       FILE * f = fopen("..\\src\\modules\\modules-release.mak", "w");\r
-#endif\r
 \r
        time_t t = time(NULL);\r
        fprintf(f, "# Generated at %s\n", ctime(&t));\r
@@ -441,8 +433,10 @@ void WriteCompileModules()
        fprintf(f, "\n.cpp.obj:\n");\r
 #ifdef _DEBUG\r
        fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /GS /RTC1 /MTd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");\r
+       CreateDirectory("..\\src\\modules\\debug", NULL);\r
 #else\r
        fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /GS /MT /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W3 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");\r
+       CreateDirectory("..\\src\\modules\\release", NULL);\r
 #endif\r
        \r
        fprintf(f, "makedir:\n  if not exist debug mkdir debug\n\n");\r