From 65a7593c15b35ff5b155d83f5c3fa16c80d28b18 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 24 Feb 2009 12:54:55 +0000 Subject: [PATCH] 2009-02-24 13:53 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * config/win/pocc64.cf % Optimized to use pocc.cf and modify that slightly for x64. --- harbour/ChangeLog | 4 +++ harbour/config/win/pocc64.cf | 55 ++---------------------------------- 2 files changed, 6 insertions(+), 53 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5765584700..43c40ff8bd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-24 13:53 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * config/win/pocc64.cf + % Optimized to use pocc.cf and modify that slightly for x64. + 2009-02-24 13:49 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbsetup.h * minor modifications in macros diff --git a/harbour/config/win/pocc64.cf b/harbour/config/win/pocc64.cf index 5421e04f4f..94efc3018d 100644 --- a/harbour/config/win/pocc64.cf +++ b/harbour/config/win/pocc64.cf @@ -6,59 +6,8 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf -OBJ_EXT = .obj -EXE_EXT = .exe -LIB_PREF = -LIB_EXT = .lib +include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.cf -CC = pocc.exe -CC_IN = -c -CC_OUT = -Fo -CPPFLAGS = -I. /Tamd64-coff - -CPPFLAGS += -Ze -Go -MT - -# optimizations -CPPFLAGS += -Ot -Ox - -ifneq ($(HB_INC_COMPILE),) -CPPFLAGS += -I$(HB_INC_COMPILE) -endif - -CFLAGS = - -LD = polink.exe -LD_OUT = -OUT: - -# Add all libraries specified in CONTRIBS and LIBS. -ifeq ($(HB_LIB_COMPILE),) -LINKPATHS += -LIBPATH:$(LIB_DIR) -else -LINKPATHS += -LIBPATH:$(HB_LIB_COMPILE) -endif -LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT)) -LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT)) - -# If LIBS specifies the rdd library, add all DB drivers. -ifeq ($(findstring rdd,$(LIBS)),rdd) -LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), $(drv)$(LIB_EXT)) -endif - -# Add the specified GT driver library -ifeq ($(findstring rtl,$(LIBS)),rtl) -LINKLIBS += $(foreach gt, $(HB_GT_LIBS), $(gt)$(LIB_EXT)) -endif - -LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib gdi32.lib wsock32.lib ws2_32.lib advapi32.lib -LDFLAGS += winspool.lib ole32.lib oleaut32.lib uuid.lib \ - comctl32.lib mapi32.lib mpr.lib - -ifeq ($(HB_GT_LIB),gtgui) -LDFLAGS += /SUBSYSTEM:WINDOWS -endif - -AR = polib.exe -ARFLAGS = $(HB_USER_AFLAGS) -AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) +CPPFLAGS += /Tamd64-coff include $(TOP)$(ROOT)config/rules.cf