Changeset 19524 for indexers/trunk/winMake.bat

Timestamp:

2009-05-19T16:59:34+12:00 (15 years ago)

Author:

ak19

Message:

Dr Bainbridge updated the Windows makefiles to 1. Take the DEBUG flag so that we can recompile all of GS2 in the Vis C++ 2005 Express Edition command prompt and then use its Debugger on the C code. 2. Now GS2 make clean command cleans up all object and lib files that its make generates.

File:

• indexers/trunk/winMake.bat (modified) (5 diffs)

indexers/trunk/winMake.bat

@@ -3 +3 @@
 set MAKE=nmake
 set MAKE_OPTIONS=/f
+
+if "%DEBUG%" == "" (
+  set MAKE_VARS=DEBUG=0
+) else (
+  set MAKE_VARS=DEBUG=%DEBUG%
+)
 
 if ""%1"" == """" goto all
@@ -27 +33 @@
     if NOT EXIST "iconv" unzip iconv.zip
     cd iconv
-    %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
+    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
     cd ..\..\..\..
 
     cd packages\unac
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..\..
 
     cd mg
-    call winMake.bat %1 
+    call winMake.bat %1
     cd ..
 
@@ -45 +51 @@
     call winMake.bat %1
     cd ..
+
+    if ""%1"" == ""clean"" goto clean2 
     goto done
+
+:: Need another clean because a pre-all clean command sent to iconv regenerates some lib 
+:: and object files. So we delete these after it's finished processing the clean command
+:clean2 
+    for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.obj del packages\windows\iconv\iconv\%%I\*.obj;
+    for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.lib del packages\windows\iconv\iconv\%%I\*.lib;
 
 :java
@@ -63 +77 @@
 :nojava
     cd packages\windows\iconv\iconv
-    %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
+    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
     cd ..\..\..\..
 
     cd packages\unac
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..\..
 
@@ -83 +97 @@
 
     cd packages\windows\iconv\iconv
-    %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
+    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
     cd ..\..\..\..
 
     cd packages\unac
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..\..