From 56f2fd871a9fbbb47fbe2d4cfa2fd2309b886eef Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 16 Aug 2008 14:16:55 +0000 Subject: [PATCH] 2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * config/os2/gcc.cf % Cleaned include path for OS/2/GCC. David, please test it if it still builds successfully. * make_b32.mak * make_gcc.mak * make_vc.mak * make_vcce.mak * utils/hbmake/hbmake.prg % Removed using -D__EXPORT__ from any Harbour command lines, as this switch has no effect of the .prg level. --- harbour/ChangeLog | 13 +++++++++++++ harbour/config/os2/gcc.cf | 2 +- harbour/make_b32.mak | 2 +- harbour/make_gcc.mak | 2 +- harbour/make_vc.mak | 2 +- harbour/make_vcce.mak | 2 +- harbour/utils/hbmake/hbmake.prg | 10 +++++----- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c0f5e806f8..337a23444e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,19 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * config/os2/gcc.cf + % Cleaned include path for OS/2/GCC. + David, please test it if it still builds successfully. + + * make_b32.mak + * make_gcc.mak + * make_vc.mak + * make_vcce.mak + * utils/hbmake/hbmake.prg + % Removed using -D__EXPORT__ from any Harbour command lines, + as this switch has no effect of the .prg level. + 2008-08-16 13:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * doc/linux1st.txt + Added some quick openSUSE package requirement information. diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index d2425907cc..806aef1931 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -12,7 +12,7 @@ LIB_EXT = .a CC = gcc CC_IN = -c CC_OUT = -o -CPPFLAGS = -I. -I$(TOP)include -I$(HB_INC_COMPILE) +CPPFLAGS = -I. -I$(HB_INC_COMPILE) CFLAGS = -W -Wall -O2 # 26/03/2004 - diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index 1830103f9b..87d22827f4 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -147,7 +147,7 @@ CEXEFLAGSDLL = -tWM $(CLIBFLAGSxxx) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) -HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) +HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak index 14deba2c3d..bf7e535160 100644 --- a/harbour/make_gcc.mak +++ b/harbour/make_gcc.mak @@ -206,7 +206,7 @@ endif HBFLAGSCMN := -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS := -n $(HBFLAGSCMN) $(HARBOURFLAGS) -HARBOURFLAGSDLL:= -D__EXPORT__ -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL) +HARBOURFLAGSDLL:= -n1 -l $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** # Linker Flags diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index 42073991b3..8dfb7c2804 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -157,7 +157,7 @@ CEXEFLAGSDLL = -MT$(DBGMARKER) $(CLIBFLAGS) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) -HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) +HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak index 22509388a9..54a61ea8d2 100644 --- a/harbour/make_vcce.mak +++ b/harbour/make_vcce.mak @@ -172,7 +172,7 @@ CEXEFLAGSDLL = $(CLIBFLAGS) $(CEXEFLAGSDLL) # Harbour Compiler Flags HBFLAGSCMN = -DHB_WINCE -D__PLATFORM__WINCE -i$(INCLUDE_DIR) -q0 -w3 -es2 -gc0 -km $(PRG_USR) HARBOURFLAGS = -n $(HBFLAGSCMN) $(HARBOURFLAGS) -HARBOURFLAGSDLL= -D__EXPORT__ -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) +HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** diff --git a/harbour/utils/hbmake/hbmake.prg b/harbour/utils/hbmake/hbmake.prg index d106f08dff..b09a7d50dd 100644 --- a/harbour/utils/hbmake/hbmake.prg +++ b/harbour/utils/hbmake/hbmake.prg @@ -2329,7 +2329,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\bcc32 -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -D__EXPORT__ -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$* $**" } ) ENDIF @@ -2344,7 +2344,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.o:", "gcc -I/usr/include/harbour $(CFLAG1) $(CFLAG2) -I. -g -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "harbour -D__EXPORT__ -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "harbour -n -I/usr/include/harbour $(HARBOURFLAGS) -I. -o$* $**" } ) ENDIF @@ -2354,7 +2354,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.o:", "$(CC_DIR)\bin\gcc -I$(HB_DIR)/include $(CFLAG1) $(CFLAG2) -I. -o$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -D__EXPORT__ -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) + AAdd( s_aCommands, { ".prg.o:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)/include $(HARBOURFLAGS) " +IIF( lHwgui, " -I$(HWGUI)/include","" ) +" -o$* $**" } ) ENDIF @@ -2367,7 +2367,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\bin\cl -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -D__EXPORT__ -n -I$(HB_DIR)\include $(HARBOURFLAGS) -go" + if(s_lGenCsource,"3","") + " -I$(C4W)\include" + IIF( lMediator," -I$(MEDIATOR)\include ","")+ "-o$* $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -go" + if(s_lGenCsource,"3","") + " -I$(C4W)\include" + IIF( lMediator," -I$(MEDIATOR)\include ","")+ "-o$* $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS) -I$(C4W)\include -o$* $**" } ) ENDIF @@ -2380,7 +2380,7 @@ Endif // Create and compile AAdd( s_aCommands, { ".c.obj:", "$(CC_DIR)\BIN\pocc -I$(HB_DIR)\include $(CFLAG1) $(CFLAG2) -Fo$* $**" } ) IF s_lExtended - AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -D__EXPORT__ -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$** $**" } ) + AAdd( s_aCommands, { ".prg.obj:", "$(HB_DIR)\bin\harbour -n"+if(s_lasdll,"1","")+" -go" + if(s_lGenCsource,"3","") + " -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) ) )+IIF( lWhoo," -I$(WHOO)\include ","")+ IIF( lMediator," -I$(MEDIATOR)\include ","")+" -o$** $**" } ) ELSE AAdd( s_aCommands, { ".prg.c:", "$(HB_DIR)\bin\harbour -n -I$(HB_DIR)\include $(HARBOURFLAGS)" + IIF( lFwh, " -I$(FWH)\include", IIF( lMinigui, " -I$(MINIGUI)\include",IIF( lHwgui, " -I$(HWGUI)\include","" ) )) + " -o$** $**" } ) ENDIF