diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4c08bf0781..48f71bdf4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-14 13:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_b32.mak + * make_vc.mak + * contrib/mtpl_b32.mak + * contrib/mtpl_vc.mak + + Attempt to add support for L_USR and A_USR + in non-GNU make. A_USR is probably wrong, L_USR + might also be. Please test. + 2008-09-14 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * harbour-ce-spec * make_xmingwce.sh diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index bf47e6d119..c1d0d327b0 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -141,13 +141,13 @@ CFLAGS = -I$(INCLUDE_DIR) $(C_USR) $(CFLAGS) $(HB_BUILD_MODE) CLIBFLAGS = -c -q -d -w -w-sig- $(CFLAGS) $(CLIBFLAGS) HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) +LDFLAGS = $(LDFLAGS) $(L_USR) #********************************************************** # This is needed, otherwise the libs may overflow when # debug info is requested with -v -y -ARFLAGS = /P32 +ARFLAGS = /P32 $(A_USR) #********************************************************** # COMPILE Rules diff --git a/harbour/contrib/mtpl_vc.mak b/harbour/contrib/mtpl_vc.mak index 1f6fe85fa2..2a04fce338 100644 --- a/harbour/contrib/mtpl_vc.mak +++ b/harbour/contrib/mtpl_vc.mak @@ -142,7 +142,7 @@ CFLAGS = -MT$(DBGMARKER) $(CFLAGS) CLIBFLAGS = -c $(CFLAGS) $(CLIBFLAGS) HARBOURFLAGS = -i$(INCLUDE_DIR) -n -q0 -w3 -es2 -km $(PRG_USR) $(HARBOURFLAGS) -LDFLAGS = $(LDFLAGS) +LDFLAGS = $(LDFLAGS) $(L_USR) #********************************************************** # COMPILE Rules diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak index ea78b39ce5..5a8b0563d2 100644 --- a/harbour/make_b32.mak +++ b/harbour/make_b32.mak @@ -26,6 +26,8 @@ # CLIBFLAGS - Extra C compiler options for the static libraries # CLIBFLAGSDLL - Extra C compiler options for the shared libraries # +# L_USR - Extra linker options for the static libraries +# (GNU make compatible envvar) # LDFLAGS - Extra linker options for the static libraries # LDFLAGSDLL - Extra linker options for the shared libraries # @@ -152,7 +154,7 @@ HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) #********************************************************** # Linker Flags -LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS) +LDFLAGS = -ap -Tpe -Gn -C -L$(LIB_DIR) -L$(BIN_DIR) $(LDFLAGS) $(L_USR) LDFLAGSDLL = -aa -Gn -C -Tpd -Gi -L$(LIB_DIR) $(LDFLAGSDLL) !if "$(HB_BUILD_DEBUG)" == "yes" LDFLAGS = -v $(LDFLAGS) @@ -163,7 +165,7 @@ LDFLAGSDLL = -aa -Gn -C -Tpd -Gi -L$(LIB_DIR) $(LDFLAGSDLL) # This is needed, otherwise the libs may overflow # when debug info is requested with -v -y -ARFLAGS = /P32 +ARFLAGS = /P32 $(A_USR) #********************************************************** #********************************************************** diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index fe77dec565..8a803e22a8 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -26,6 +26,8 @@ # CLIBFLAGS - Extra C compiler options for the static libraries # CLIBFLAGSDLL - Extra C compiler options for the shared libraries # +# L_USR - Extra linker options for the static libraries +# (GNU make compatible envvar) # LDFLAGS - Extra linker options for the static libraries # LDFLAGSDLL - Extra linker options for the shared libraries # @@ -231,7 +233,7 @@ HARBOURFLAGSDLL= -n1 $(HBFLAGSCMN) $(HARBOURFLAGSDLL) LDFLAGS = /NOLOGO /SUBSYSTEM:WINDOWSCE,4.20 /MACHINE:ARM /ARMPADCODE \ /STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \ /NODEFAULTLIB:"kernel32.lib" /ALIGN:4096 /OPT:REF /OPT:ICF \ - /LIBPATH:$(LIB_DIR) $(LDFLAGS) + /LIBPATH:$(LIB_DIR) $(LDFLAGS) $(L_USR) # /ERRORREPORT:PROMPT /ENTRY:"mainWCRTStartup" !if $(HB_VISUALC_VER) >= 80 LDFLAGS = $(LDFLAGS) /MANIFEST:NO @@ -241,7 +243,7 @@ LDFLAGSDLL = /DLL \ /STACK:65536,4096 /NODEFAULTLIB:"oldnames.lib" \ /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL) !else -LDFLAGS = /NOLOGO /SUBSYSTEM:console /LIBPATH:$(LIB_DIR) $(LDFLAGS) +LDFLAGS = /NOLOGO /SUBSYSTEM:console /LIBPATH:$(LIB_DIR) $(LDFLAGS) $(L_USR) LDFLAGSDLL = /DLL \ /NOLOGO /LIBPATH:$(LIB_DIR) $(LDFLAGSDLL) !endif