fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-02-24 18:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* source/vm/fm.c
    ! Fixed compilation error in dlmalloc with pocc64.

  * config/win/pocc64.cf
  * config/win/msvc64.cf
    * Cleanup.

  * config/win/gcc.cf
    ! Added gdi32 to system lib list.

  * config/win/mingw.cf
  * config/win/mingwce.cf
    * Minor sync with each other.
    % Two duplicated lines removed from mingwce. I hope these
      weren't intentional.
      ---
      AR = $(CCPREFIX)ar
      ARFLAGS = $(HB_USER_AFLAGS)
      ---
This commit is contained in:
Viktor Szakats
2009-02-24 17:50:08 +00:00
parent 497ff0e672
commit 06f159c990
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -8,6 +8,27 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-24 18:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* source/vm/fm.c
! Fixed compilation error in dlmalloc with pocc64.
* config/win/pocc64.cf
* config/win/msvc64.cf
* Cleanup.
* config/win/gcc.cf
! Added gdi32 to system lib list.
* config/win/mingw.cf
* config/win/mingwce.cf
* Minor sync with each other.
% Two duplicated lines removed from mingwce. I hope these
weren't intentional.
---
AR = $(CCPREFIX)ar
ARFLAGS = $(HB_USER_AFLAGS)
---
2009-02-24 17:19 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* config/win/msvcce.cf
! Fixed another cl.exe occurence to be compatible with
@@ -60,7 +81,7 @@
2009-02-24 13:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* config/win/msvc.cf
* config/win/msvc64.cf
! Fixed to previous.
! Fixes to previous.
2009-02-24 13:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkdyn.bat

2
harbour/config/win/gcc.cf
View File

@@ -33,7 +33,7 @@ LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.
LINKLIBS += -luser32 -lwsock32
LINKLIBS += -luser32 -lgdi32 -lwsock32
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)

1
harbour/config/win/mingw.cf
View File

@@ -126,7 +126,6 @@ ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(CCPREFIX)ranlib
ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
ifneq ($(OS),Windows_NT)
AR_RULE = $(create_library)

3
harbour/config/win/mingwce.cf
View File

@@ -123,9 +123,6 @@ ARFLAGS = $(HB_USER_AFLAGS)
RANLIB = $(CCPREFIX)ranlib
AR = $(CCPREFIX)ar
ARFLAGS = $(HB_USER_AFLAGS)
ifeq ($(SHLVL),) # COMMAND.COM - length of command line is limited
ifneq ($(OS),Windows_NT)
AR_RULE = $(create_library)

4
harbour/config/win/msvc64.cf
View File

@@ -2,8 +2,4 @@
# $Id$
#
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/msvc.cf
include $(TOP)$(ROOT)config/rules.cf

6
harbour/config/win/pocc64.cf
View File

@@ -1,13 +1,7 @@
#
# $Id$
#
# The Harbour Project
# GNU MAKE file for Pelles ISO C Compiler
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.cf
CPPFLAGS += /Tamd64-coff
include $(TOP)$(ROOT)config/rules.cf

2
harbour/source/vm/fm.c
View File

@@ -134,6 +134,8 @@
# pragma warn -rch
# elif defined( HB_OS_WIN_CE ) && defined( __POCC__ )
# define ABORT TerminateProcess( GetCurrentProcess(), 0 )
# elif defined( __POCC__ ) && !defined( InterlockedCompareExchangePointer )
# define InterlockedCompareExchangePointer
# elif defined( _MSC_VER ) && !defined( USE_DL_PREFIX )
# define USE_DL_PREFIX
# endif