2002-10-29 16:20 UTC-0500 Paul Tucker <ptucker@sympatico.ca>

harbour/ChangeLog

@@ -8,7 +8,17 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
-2002-10-28 11:10 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
+2002-10-29 16:20 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
+  * makefile.vc
+    * slight re-ordering and added missed codepage.lib directive.
+  + makefile.nt
+  * make_vc.bat
+    * if building Harbour under NT, use the alternate makefile.nt
+    * for faster builds.
+  * Changelog
+    Changed date of following entry from 28 to 29.
+
+2002-10-29 11:10 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
   * source/rtl/gtwin/gtwin.c
     * modified by Robert Haley <rhaley@cheshire.net> to allow Tone()
     * to work correctly under Win9x.

harbour/make_vc.bat

@@ -13,10 +13,13 @@ rem ---------------------------------------------------------------
 
 if "%1" == "clean" goto CLEAN
 if "%1" == "CLEAN" goto CLEAN
+set MK_FILE=makefile.vc
+if "%OS%" == "Windows_NT" set MK_FILE=makefile.nt
+
 
 :BUILD
 
-   nmake /f makefile.vc %1 %2 %3 > make_vc.log
+   nmake /f %MK_FILE% %1 %2 %3 > make_vc.log
    if errorlevel 1 goto BUILD_ERR
 
 :BUILD_OK
@@ -42,7 +45,5 @@ if "%1" == "CLEAN" goto CLEAN
    if exist obj\vc\*.h   del obj\vc\*.h
    if exist obj\vc\*.pch del obj\vc\*.pch
    if exist make_vc.log  del make_vc.log
-   goto EXIT
 
 :EXIT
-

harbour/makefile.vc

@@ -1,4 +1,4 @@
-#
+#	
 # $Id$
 #
 
@@ -115,6 +115,11 @@ HBMAKE_DIR   = utils\hbmake
 HBPDF_DIR   = contrib\pdflib
 !endif
 
+!if ( "$(HB_LEX)"=="SIMPLEX" )
+# don't indent definitions
+CFLAGS = $(CFLAGS) -DSIMPLEX
+!endif
+
 #
 # C compiler definition and C flags. These should never have to change.
 #
@@ -126,12 +131,6 @@ CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
 HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)
 
-!if ( "$(HB_LEX)"=="SIMPLEX" )
-# don't indent definitions
-CFLAGS = $(CFLAGS) -DSIMPLEX
-CLIBFLAGS = $(CLIBFLAGS) -DSIMPLEX
-!endif
-
 !ifdef HB_DOC_PDF
 HARBOURFLAGS = $(HARBOURFLAGS) -dPDF
 !endif
@@ -900,7 +899,7 @@ $(HBMAKE_EXE) : \
    $(HBMAKE_DIR)\ft_funcs.prg \
    $(HBMAKE_DIR)\pickarry.prg \
    $(HBMAKE_DIR)\pickfile.prg \
-   $(HBMAKE_DIR)\prb_stak.prg 
+   $(HBMAKE_DIR)\prb_stak.prg
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $**
    $(CC) $(CFLAGS) -Fo$(OBJ_DIR)\  $(OBJ_DIR)\hbmake.c \
                                    $(OBJ_DIR)\hbmutils.c \
@@ -1089,6 +1088,7 @@ $(OBJ_DIR)\macrol.obj : $(OBJ_DIR)\macrol.c
 # dummy targets used for prg to c creation
 
 $(RTL_LIB)2    : $(RTL_LIB_OBJS)
+$(CODEPAGE_LIB)2 : $(CODEPAGE_LIB_OBJS)
 $(COMMON_LIB)2 : $(COMMON_LIB_OBJS)
 $(DEBUG_LIB)2  : $(DEBUG_LIB_OBJS)
 $(MACRO_LIB)2  : $(MACRO_LIB_OBJS)
@@ -1102,4 +1102,3 @@ $(GTCGI_LIB)2  : $(GTCGI_LIB_OBJS)
 $(GTPCA_LIB)2  : $(GTPCA_LIB_OBJS)
 $(GTSTD_LIB)2  : $(GTSTD_LIB_OBJS)
 $(GTWIN_LIB)2  : $(GTWIN_LIB_OBJS)
-