changed CFG to BLDCFG, to be the same as non-windows

diff --git a/build/windows/i386/makefile b/build/windows/i386/makefile
index cd11abf..bca3252 100644 (file)
--- a/build/windows/i386/makefile
+++ b/build/windows/i386/makefile
@@ -1,13 +1,13 @@
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

diff --git a/rgrep/build/windows/i386/makefile b/rgrep/build/windows/i386/makefile
index 695bd73..fba06b5 100644 (file)
--- a/rgrep/build/windows/i386/makefile
+++ b/rgrep/build/windows/i386/makefile
@@ -1,13 +1,13 @@
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -36,13 +36,13 @@ RVM_LIB="$(RPATK_DIR)\rvm\build\$(PORT)\$(ARCH)\out\rvm.lib"
 RLIB_LIB="$(RPATK_DIR)\rlib\build\$(PORT)\$(ARCH)\out\rlib.lib"
 INCLUDE_DIRS=/I"$(SRC_DIR)" /I"$(SRC_DIR)\win32" /I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
-!IF "$(CFG)" == "release"
+!IF "$(BLDCFG)" == "release"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /ML /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /YX /Fo"$(OUTDIR)\\" /FD /c
 LINK_DEBUG=
 
-!ELSEIF  "$(CFG)" == "debug"
+!ELSEIF  "$(BLDCFG)" == "debug"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /MLd  /Zi /W3  /EHsc  /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /YX /Fo"$(OUTDIR)\\" /FD  /c

diff --git a/rjs/build/windows/i386/makefile b/rjs/build/windows/i386/makefile
index bb447c1..cf03fdf 100644 (file)
--- a/rjs/build/windows/i386/makefile
+++ b/rjs/build/windows/i386/makefile
@@ -1,13 +1,13 @@
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -36,13 +36,13 @@ RVM_LIB="$(RPATK_DIR)\rvm\build\$(PORT)\$(ARCH)\out\rvm.lib"
 RLIB_LIB="$(RPATK_DIR)\rlib\build\$(PORT)\$(ARCH)\out\rlib.lib"
 INCLUDE_DIRS=/I"$(SRC_DIR)" /I"$(SRC_DIR)\win32" /I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
-!IF "$(CFG)" == "release"
+!IF "$(BLDCFG)" == "release"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /ML /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /Fo"$(OUTDIR)\\" /FD /c
 LINK_DEBUG=
 
-!ELSEIF  "$(CFG)" == "debug"
+!ELSEIF  "$(BLDCFG)" == "debug"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /MLd  /Zi /W3  /EHsc  /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /YX /Fo"$(OUTDIR)\\" /FD  /c

diff --git a/rlib/build/windows/i386/makefile b/rlib/build/windows/i386/makefile
index 18143ef..c63260a 100644 (file)
--- a/rlib/build/windows/i386/makefile
+++ b/rlib/build/windows/i386/makefile
@@ -1,14 +1,14 @@
 
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -32,12 +32,12 @@ RPATK_DIR=..\..\..\..
 INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
-!IF "$(CFG)" == "release"
+!IF "$(BLDCFG)" == "release"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD /c 
 
-!ELSEIF  "$(CFG)" == "debug"
+!ELSEIF  "$(BLDCFG)" == "debug"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /Zi /W3 /EHsc  /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "R_DEBUG_MEMALLOC" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD  /c

diff --git a/rpa/build/windows/i386/makefile b/rpa/build/windows/i386/makefile
index fb507ff..82177ba 100644 (file)
--- a/rpa/build/windows/i386/makefile
+++ b/rpa/build/windows/i386/makefile
@@ -1,14 +1,14 @@
 
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -32,12 +32,12 @@ RPATK_DIR=..\..\..\..
 INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
-!IF "$(CFG)" == "release"
+!IF "$(BLDCFG)" == "release"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD /c 
 
-!ELSEIF  "$(CFG)" == "debug"
+!ELSEIF  "$(BLDCFG)" == "debug"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /Zi /W3 /EHsc  /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD  /c

diff --git a/rvm/build/windows/i386/makefile b/rvm/build/windows/i386/makefile
index 1dd881a..73df0e5 100644 (file)
--- a/rvm/build/windows/i386/makefile
+++ b/rvm/build/windows/i386/makefile
@@ -1,14 +1,14 @@
 
-!IF "$(CFG)" == ""
-CFG=debug
+!IF "$(BLDCFG)" == ""
+BLDCFG=debug
 !ENDIF 
 
-!IF "$(CFG)" != "release" && "$(CFG)" != "debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
+!IF "$(BLDCFG)" != "release" && "$(BLDCFG)" != "debug"
+!MESSAGE Invalid configuration "$(BLDCFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE by defining the macro BLDCFG on the command line. For example:
 !MESSAGE 
-!MESSAGE nmake /f makefile CFG=debug
+!MESSAGE nmake /f makefile BLDCFG=debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -33,12 +33,12 @@ RPATK_DIR=..\..\..\..
 INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
-!IF "$(CFG)" == "release"
+!IF "$(BLDCFG)" == "release"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /W3 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD /c 
 
-!ELSEIF  "$(CFG)" == "debug"
+!ELSEIF  "$(BLDCFG)" == "debug"
 
 OUTDIR=.\out
 CPP_FLAGS=/nologo $(INCLUDE_DIRS) /Zp1 /Zi /W3 /EHsc  /Od /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_CONSOLE" /Fo"$(OUTDIR)\\" /FD  /c