From 67307d3dcb7ecaae6d0b764f09d8cdfb0cd6d84e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jun 2008 08:39:14 +0000 Subject: [PATCH] 2008-06-22 10:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog + Marked changes merged with 1.0.0RC1. * make_vc.mak * make_vcce.mak * Syncing between these two. ! Fixed minor typo in CE comment. ! Fixed one rule where HB var was not respected in CE DLL generation. Marek please check me. --- harbour/ChangeLog | 30 +++++++++++++------- harbour/make_vc.mak | 1 - harbour/make_vcce.mak | 65 ++++++++++++++++++++++++++----------------- 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5dfaed5cf7..df69348652 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,12 +8,23 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-22 10:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * ChangeLog + + Marked changes merged with 1.0.0RC1. + + * make_vc.mak + * make_vcce.mak + * Syncing between these two. + ! Fixed minor typo in CE comment. + ! Fixed one rule where HB var was not respected in CE + DLL generation. Marek please check me. + 2008-06-22 01:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbwhat32/Makefile ! Fixed to compile using GNU make system. This contrib needs xhb header in order to compile. (solved with an ugly hack) - [TOMERGE 1.0.0RC1] + [1.0.0RC1] 2008-06-22 00:36 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbmysql/mysql.c @@ -54,7 +65,7 @@ 2008-06-21 22:50 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbfimage/Makefile ! Fixed to compile with MinGW. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] 2008-06-21 22:24 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtalleg/gtalleg.c @@ -74,7 +85,7 @@ 2008-06-21 21:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/whatsnew.txt + Some updates. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] * contrib/Makefile ! Fix to prev. @@ -86,12 +97,12 @@ * contrib/hbwhat32/wininet.ch ! Pulled from MinGW distribution. ; TODO: Refinement for UNICODE version which I realized a little later. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] 2008-06-21 19:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/pp/hbpp.c ! Fixed to escape strings in generated hbverbld.h. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] 2008-06-21 18:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbwhat32/_winsock.c @@ -173,7 +184,6 @@ and the goal is to be able to use HB_INC_* to specify include dirs for external packages on all make systems (GNU, non-GNU .bat, non-GNU .sh) - [TOMERGE 1.0.0RC1] 2008-06-21 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu) - contrib/hbgf/gtk @@ -193,11 +203,11 @@ * contrib/hbw32ddr/Makefile ! Fixed to compile with GNU make. ! Found a way to compile with MingW. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] * contrib/hbtpathy/Makefile ! Fixed to work at all. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] * contrib/Makefile * contrib/gtwvg/Makefile @@ -222,7 +232,7 @@ - contrib/hbw32ddr/w32_ddrw.h * contrib/hbw32ddr/w32_ddrw.cpp * Cleanups, removing unneeded fluffs. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] * contrib/hbziparch/make_b32_dll.mak - Removed many unneeded command line switches. @@ -258,7 +268,7 @@ Anybody volunteering to clear these up? ; NOTE: Please test these changes, I'm not a user of this contrib. - [TOMERGE 1.0.0RC1] + [1.0.0RC1] 2008-06-21 12:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * ChangeLog diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 229d8f56bb..4e1f3ff61d 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -902,7 +902,6 @@ user32.lib winspool.lib #********************************************************** # DLL Targets #********************************************************** -#$(HARBOUR_DLL) : $(HARBOUR_EXE) $(DLL_OBJS) $(HARBOUR_DLL) : $(HB) $(DLL_OBJS) $(LINKER) @<< $(LDFLAGSDLL) /OUT:$(@) diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index cc5ce67388..f892aff4f0 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -44,7 +44,7 @@ # Harbour will be installed when the command # "make_vc.bat install" is lauched. Defaults # to current directory -# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 60). +# HB_VISUALC_VER - Version of Visual C++ compiler (defaults to 80). # Possible values are : 60, 70, 71, 80 #********************************************************** @@ -110,6 +110,8 @@ DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc) # Main "Include" directory INCLUDE_DIR = include +#********************************************************** + # In which mode compile Harbour C or CPP !if "$(HB_BUILD_MODE)" == "cpp" HB_BUILD_MODE = P @@ -117,6 +119,8 @@ HB_BUILD_MODE = P HB_BUILD_MODE = C !endif +#********************************************************** + # C Compiler Flags !if $(HB_VISUALC_VER) >= 80 CFLAGS_VER = -Od -Os -Gy -GS- -EHsc- -fp:fast -Gm -Zi -GR- -FD -D_CRT_SECURE_NO_DEPRECATE @@ -152,15 +156,21 @@ CFLAGS = -D"HB_GT_LIB=$(HB_GT_LIB:gt=)" $(CFLAGS) #----------- CFLAGS = -MT$(DBGMARKER) $(CFLAGS) +#********************************************************** + CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) CLIBFLAGSDLL = -D__EXPORT__ $(CLIBFLAGS) $(CLIBFLAGSDLL) CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) +#********************************************************** + # Harbour Compiler Flags HBFLAGSCMN = -DHB_WINCE -D__PLATFORM__WINCE -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc1 $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) +#********************************************************** + # Linker Flags LDFLAGS = /NOLOGO /SUBSYSTEM:windowsce,4.20 /MACHINE:ARM /ARMPADCODE \ /STACK:65536,4096 /ALIGN:4096 /NODEFAULTLIB:"oldnames.lib" \ @@ -781,6 +791,8 @@ $(GTWVT_LIB) : $(GTWVT_LIB_OBJS) $(GTGUI_LIB) : $(GTGUI_LIB_OBJS) $(MKLIB) /out:$@ $** #********************************************************** + +#********************************************************** # EXECUTABLE Targets #********************************************************** @@ -813,20 +825,6 @@ $(COMMON_LIB) coredll.lib corelibc.lib <<$(KEEPSTATE) #********************************************************** -# HBPPTEST build rule -#********************************************************** -$(HBPPTEST_EXE) : $(HBPPTEST_EXE_OBJS) - IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul - $(LINKER) @<< -$(LDFLAGS) -/OUT:$(HBPPTEST_EXE) -$(**: = ^ -) -$(PP_LIB) -$(STANDARD_STATIC_HBLIBS) -coredll.lib corelibc.lib winsock.lib ws2.lib -<< -#********************************************************** # HBRUN build rule #********************************************************** $(HBRUN_EXE) : $(HBRUN_EXE_OBJS) @@ -838,7 +836,7 @@ $(**: = ^ ) $(STANDARD_STATIC_HBLIBS) coredll.lib corelibc.lib winsock.lib ws2.lib -<< +<<$(KEEPSTATE) #********************************************************** # HBDOT build rule #********************************************************** @@ -864,7 +862,21 @@ $(**: = ^ ) $(STANDARD_STATIC_HBLIBS) coredll.lib corelibc.lib winsock.lib ws2.lib -<< +<<$(KEEPSTATE) +#********************************************************** +# HBPPTEST build rule +#********************************************************** +$(HBPPTEST_EXE) : $(HBPPTEST_EXE_OBJS) + IF EXIST "$(HBPPTEST_EXE)" $(DEL) "$(HBPPTEST_EXE)" > nul + $(LINKER) @<< +$(LDFLAGS) +/OUT:$(HBPPTEST_EXE) +$(**: = ^ +) +$(PP_LIB) +$(STANDARD_STATIC_HBLIBS) +coredll.lib corelibc.lib winsock.lib ws2.lib +<<$(KEEPSTATE) #********************************************************** # HBDOC build rule #********************************************************** @@ -875,9 +887,10 @@ $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS) $(HBDOC_LIBS) +$(STANDARD_STATIC_HBLIBS) +$(HBDOC_LIBS) coredll.lib corelibc.lib winsock.lib ws2.lib -<< +<<$(KEEPSTATE) #********************************************************** # HBMAKE build rule #********************************************************** @@ -890,7 +903,7 @@ $(**: = ^ ) $(STANDARD_STATIC_HBLIBS) coredll.lib corelibc.lib winsock.lib ws2.lib -<< +<<$(KEEPSTATE) #********************************************************** # HBVER build rule #********************************************************** @@ -903,24 +916,24 @@ $(**: = ^ ) $(STANDARD_STATIC_HBLIBS) coredll.lib corelibc.lib winsock.lib ws2.lib -<< +<<$(KEEPSTATE) #********************************************************** #********************************************************** # DLL Targets #********************************************************** -$(HARBOUR_DLL) : $(HARBOUR_EXE) $(DLL_OBJS) +$(HARBOUR_DLL) : $(HB) $(DLL_OBJS) $(LINKER) @<< $(LDFLAGSDLL) /OUT:$(@) /IMPLIB:$(@:.dll=.lib) $(DLL_OBJS: = ^ ) coredll.lib gdi32.lib -<< +<<$(KEEPSTATE) #********************************************************** # DLL EXECUTABLE Targets #********************************************************** -HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd.obj $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc) +HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc) $(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS) $(LINKER) @<< $(LDFLAGS) @@ -928,9 +941,9 @@ $(LDFLAGS) $(HBTESTDLL_OBJS: = ^ ) $(HARBOUR_DLL:.dll=.lib) -<< +<<$(KEEPSTATE) #---------------------------------------------------------- -$(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c +$(DLL_OBJ_DIR)\mainstd$(OBJEXT) : $(VM_DIR)\mainstd.c $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $** #**********************************************************