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

2008-08-26 22:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/gtalleg/Makefile
     * Excluded for POCC and XCC.

   * contrib/gtalleg/ssf.h
     ! Setting platform before include Allegro headers.
       (I'm not sure this is necessary for all platforms, 
       but it surely is for BCC and MinGW).

   * contrib/gtwvg/gtwvg.h
     ! __MINGW__ -> __MINGW32__. __MINGW__ is not #defined by MinGW.
This commit is contained in:
Viktor Szakats
2008-08-26 20:42:46 +00:00
parent 88acfc5661
commit aec59c21e9
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-08-26 22:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/gtalleg/Makefile
* Excluded for POCC and XCC.
* contrib/gtalleg/ssf.h
! Setting platform before include Allegro headers.
(I'm not sure this is necessary for all platforms,
but it surely is for BCC and MinGW).
* contrib/gtwvg/gtwvg.h
! __MINGW__ -> __MINGW32__. __MINGW__ is not #defined by MinGW.
2008-08-26 22:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbct/atnum.c
! Workaround for PelleC 5.00.1 bug in AMD64 mode.

9
harbour/contrib/gtalleg/Makefile
View File

@@ -6,6 +6,9 @@ ROOT = ../../
LIBNAME=gtalleg
ifneq ($(HB_ARCHITECTURE),pocc)
ifneq ($(HB_ARCHITECTURE),xcc)
ifeq ($(HB_INC_ALLEGRO),)
ifeq ($(HB_XBUILD),)
HB_INC_ALLEGRO = /usr/include
@@ -27,3 +30,9 @@ include $(TOP)$(ROOT)config/lib.cf
else
include $(TOP)$(ROOT)config/none.cf
endif
else
include $(TOP)$(ROOT)config/none.cf
endif
else
include $(TOP)$(ROOT)config/none.cf
endif

12
harbour/contrib/gtalleg/ssf.h
View File

@@ -65,6 +65,18 @@
#if defined(__BORLANDC__)
#define ALLEGRO_NO_ASM
#define ALLEGRO_BCC32
#elif defined(_MSC_VER)
#define ALLEGRO_MSVC
#elif defined(__MINGW32__)
#define ALLEGRO_MINGW32
#elif defined(__DMC__)
#define ALLEGRO_DMC
#elif defined(__DJGPP__)
#define ALLEGRO_DJGPP
#elif defined(__WATCOMC__)
#define ALLEGRO_WATCOM
#elif defined(HB_OS_DARWIN)
#define ALLEGRO_MACOSX
#endif
#include <allegro.h>

2
harbour/contrib/gtwvg/gtwvg.h
View File

@@ -77,7 +77,7 @@
#include <oleauto.h>
#include <olectl.h>
#include <commdlg.h>
#if defined(__MINGW__)
#if defined(__MINGW32__)
# include <comctl32.h>
#endif
#include <shlobj.h>