From 9b35872d6f80f8bd97096019ee2761878cbc25f7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 31 Mar 2009 01:11:22 +0000 Subject: [PATCH] 2009-03-31 02:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbsetup.h % '( defined(__POCC_TARGET__) && __POCC_TARGET__ == 2 ) )' removed altogether. WinCE is detected anyway by using _WINCE. * external/sqlite3/Makefile - Disabled for poccce due to errors. * external/libpng/Makefile ! Fix to prev (poccce). * config/win/poccce.cf ! Added -D_M_ARM. * config/win/owatcom.cf * Pentium Pro scheduling. * Changed back to __cdecl calling convention from register based until we find a way to tweak HB_EXPORT to force __cdecl for .dll exported functions. ; TOFIX: Find out how to force __cdecl for HB_EXPORT functions in owatcom. Or, if this is no good solution for owatcom users, or not an option and performace is more important, we must rename owatcom Harbour .dlls to a distinct name: harbour[mt]-11-ow.dll. We should try to avoid that. * config/win/bcc.cf * -4 -> -6 for Pentium Pro instructions. Looking at the generated code this looks like rescheduling, if someone now can test Harbour or plain Pentium, it would be good to know if it still works. --- harbour/ChangeLog | 30 ++++++++++++++++++++++++++++++ harbour/config/win/bcc.cf | 2 +- harbour/config/win/owatcom.cf | 2 +- harbour/config/win/poccce.cf | 2 +- harbour/external/libpng/Makefile | 2 +- harbour/external/sqlite3/Makefile | 3 +++ harbour/include/hbsetup.h | 2 +- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 93d0a07ee5..aa25714333 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,36 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-31 02:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/hbsetup.h + % '( defined(__POCC_TARGET__) && __POCC_TARGET__ == 2 ) )' + removed altogether. WinCE is detected anyway by using _WINCE. + + * external/sqlite3/Makefile + - Disabled for poccce due to errors. + + * external/libpng/Makefile + ! Fix to prev (poccce). + + * config/win/poccce.cf + ! Added -D_M_ARM. + + * config/win/owatcom.cf + * Pentium Pro scheduling. + * Changed back to __cdecl calling convention from register based + until we find a way to tweak HB_EXPORT to force __cdecl for + .dll exported functions. + ; TOFIX: Find out how to force __cdecl for HB_EXPORT functions in owatcom. + Or, if this is no good solution for owatcom users, or not + an option and performace is more important, we must rename + owatcom Harbour .dlls to a distinct name: harbour[mt]-11-ow.dll. + We should try to avoid that. + + * config/win/bcc.cf + * -4 -> -6 for Pentium Pro instructions. Looking at the generated + code this looks like rescheduling, if someone now can test Harbour + or plain Pentium, it would be good to know if it still works. + 2009-03-31 02:46 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/dos/owatcom.cf * harbour/config/win/owatcom.cf diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf index 94d50ca1ef..f8c468b0bc 100644 --- a/harbour/config/win/bcc.cf +++ b/harbour/config/win/bcc.cf @@ -23,7 +23,7 @@ CFLAGS += -w -w-sig- -Q endif ifneq ($(HB_BUILD_OPTIM),no) -CFLAGS += -d -4 -O2 -OS -Ov -Oi -Oc +CFLAGS += -d -6 -O2 -OS -Ov -Oi -Oc endif ifeq ($(HB_BUILD_DEBUG),yes) diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf index 3047c87241..abe520a7db 100644 --- a/harbour/config/win/owatcom.cf +++ b/harbour/config/win/owatcom.cf @@ -37,7 +37,7 @@ endif ifneq ($(HB_BUILD_OPTIM),no) # architecture flags -CPPFLAGS += -5r -fp5 +CPPFLAGS += -6s -fp6 # optimization flags # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code diff --git a/harbour/config/win/poccce.cf b/harbour/config/win/poccce.cf index 0384a8fcf5..642e2c3695 100644 --- a/harbour/config/win/poccce.cf +++ b/harbour/config/win/poccce.cf @@ -32,7 +32,7 @@ CPPFLAGS += -Ot endif # For Pocket PC and ARM processors (including XScale) -CPPFLAGS += -Tarm-coff -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE +CPPFLAGS += -Tarm-coff -D_M_ARM -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE ifneq ($(HB_INC_COMPILE),) CPPFLAGS += -I$(HB_INC_COMPILE) diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index 685a8e9149..0f000dc058 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -19,7 +19,7 @@ endif ifeq ($(HB_ARCHITECTURE),dos) HB_WITH_LIBPNG=yes endif -ifeq ($(HB_ARCHITECTURE),poccce) +ifeq ($(HB_COMPILER),poccce) HB_WITH_LIBPNG=no endif endif diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile index 5b1022a875..cd4dd38d9e 100644 --- a/harbour/external/sqlite3/Makefile +++ b/harbour/external/sqlite3/Makefile @@ -29,6 +29,9 @@ endif ifeq ($(HB_COMPILER),bcc) HB_WITH_SQLITE3=no endif +ifeq ($(HB_COMPILER),poccce) +HB_WITH_SQLITE3=no +endif endif ifeq ($(HB_WITH_SQLITE3),yes) diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index c8c95e030c..1f34119094 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -310,7 +310,7 @@ /* Sub-option inside HB_OS_WIN */ #ifndef HB_OS_WIN_CE - #if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__) || (defined(__POCC_TARGET__) && __POCC_TARGET__ == 2) + #if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__) #define HB_OS_WIN_CE /* Compatibility. Do not use this. */ #ifdef HB_LEGACY_LEVEL2