From 4d629b6ed138c1fe496e85fc09daf64b04a97ad7 Mon Sep 17 00:00:00 2001
From: Paul Tucker <ptucker@sympatico.ca>
Date: Sun, 12 Mar 2000 20:21:58 +0000
Subject: [PATCH] see changelog 20000312-15:18 EST

---
 harbour/ChangeLog      |  9 +++++++++
 harbour/bin/bld_vc.bat |  2 +-
 harbour/makefile.vc    | 16 ++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b7be0d281a..75ff333e0f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+20000312-15:18 EST Paul Tucker <ptucker@sympatico.ca>
+   * makefile.vc
+     * standardise compile for tone.c and oemansi.c
+     + add user32.lib to hbrun.exe and hbdoc.exe
+   * source/rtl/tone.c
+     * include hbdefs.h (for windows.h) for msvc
+   * bin\bld_vc.bat
+     + user32.lib
+
 20000312-16:24 GMT+1 Victor Szakats <info@szelvesz.hu>
    * makefile.bc
      ! "echo" commands changed to "echo.", to avoid conflict with an ECHO.EXE
diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/bld_vc.bat
index 81c0a2c796..be2c609d45 100644
--- a/harbour/bin/bld_vc.bat
+++ b/harbour/bin/bld_vc.bat
@@ -4,6 +4,6 @@ rem $Id$
 rem
 
 ..\bin\harbour %1 %2 %3 /n /i..\include
-cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib
+cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -I..\include %1.c /link /subsystem:CONSOLE ..\lib\tools.lib ..\lib\debug.lib ..\lib\vm.lib ..\lib\rtl.lib ..\lib\rdd.lib ..\lib\macro.lib ..\lib\pp.lib ..\lib\dbfntx.lib ..\lib\dbfcdx.lib ..\lib\common.lib user32.lib
 rem del %1.c
 
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 45057de29e..22cc3bc249 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -89,6 +89,14 @@ LIBS = \
     $(LIBLIST) \
     $(MACRO_LIB)
 
+#
+# programs that use OemToAnsi require user32.lib
+#
+
+LIBS2 = \
+    $(LIBS) \
+    user32.lib
+
 #
 # OBJ list for rtl.lib. Add new ones as needed
 #
@@ -343,7 +351,7 @@ $(PP_EXE) : \
 $(RUNNER_EXE) : \
     $(RUNNER_DIR)\stdalone\hbrun.prg
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\hbrun.prg
-    $(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbrun.c -o $(BIN_DIR)\hbrun /link  $(LIBS)
+    $(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbrun.c -o $(BIN_DIR)\hbrun /link  $(LIBS2)
     -del hbrun.obj
 
 #
@@ -402,7 +410,7 @@ $(HBDOC_EXE) : \
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genrtf.prg
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genhpc.prg
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $(HBDOC_DIR)\genasc.prg
-    $(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbdoc.c $(OBJ_DIR)\genos2.c $(OBJ_DIR)\gentrf.c $(OBJ_DIR)\genng.c $(OBJ_DIR)\genhtm.c $(OBJ_DIR)\genrtf.c $(OBJ_DIR)\genhpc.c $(OBJ_DIR)\genasc.c -o $(HBDOC_EXE) /link $(LIBS)
+    $(CC) -TP $(CFLAGS) $(OBJ_DIR)\hbdoc.c $(OBJ_DIR)\genos2.c $(OBJ_DIR)\gentrf.c $(OBJ_DIR)\genng.c $(OBJ_DIR)\genhtm.c $(OBJ_DIR)\genrtf.c $(OBJ_DIR)\genhpc.c $(OBJ_DIR)\genasc.c -o $(HBDOC_EXE) /link $(LIBS2)
     -del hbdoc.obj
     -del genos2.obj
     -del gentrf.obj
@@ -738,7 +746,7 @@ $(OBJ_DIR)\objfunc.obj : $(OBJ_DIR)\objfunc.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 $(OBJ_DIR)\oemansi.obj : $(RTL_DIR)\oemansi.c
-    $(CC) -W1 -nologo -I$(INCLUDE_DIR) -DHB_GT_WIN -c -TP -Fo$@ $**
+    $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 $(OBJ_DIR)\oldbox.obj : $(RTL_DIR)\oldbox.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
@@ -834,7 +842,7 @@ $(OBJ_DIR)\tlabel.obj : $(OBJ_DIR)\tlabel.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 $(OBJ_DIR)\tone.obj : $(RTL_DIR)\tone.c
-    $(CC) -W1 -nologo -I$(INCLUDE_DIR) -DHB_GT_WIN -c -TP -Fo$@ $**
+    $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 $(OBJ_DIR)\trace.obj : $(RTL_DIR)\trace.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**