Browse Source

* fixed ptc build on win32 and win64

git-svn-id: trunk@16028 -
nickysn 15 years ago
parent
commit
20baea1bee
2 changed files with 9 additions and 5 deletions
  1. 5 5
      packages/ptc/Makefile
  2. 4 0
      packages/ptc/Makefile.fpc

+ 5 - 5
packages/ptc/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/19]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/20]
 #
 #
 default: all
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -273,7 +273,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
+override TARGET_UNITS+=ptc ptcwrapper ptceventqueue  p_ddraw
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
@@ -399,7 +399,7 @@ ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
+override TARGET_UNITS+=ptc ptcwrapper ptceventqueue  p_ddraw
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
 override TARGET_UNITS+=ptc ptcwrapper ptceventqueue
@@ -655,7 +655,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
+override COMPILER_SOURCEDIR+=src src/ptcwrapper  src/win32/directx
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
@@ -781,7 +781,7 @@ ifeq ($(FULL_TARGET),x86_64-darwin)
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src src/ptcwrapper
+override COMPILER_SOURCEDIR+=src src/ptcwrapper  src/win32/directx
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override COMPILER_SOURCEDIR+=src src/ptcwrapper
 override COMPILER_SOURCEDIR+=src src/ptcwrapper

+ 4 - 0
packages/ptc/Makefile.fpc

@@ -8,6 +8,8 @@ version=2.5.1
 
 
 [target]
 [target]
 units=ptc ptcwrapper ptceventqueue
 units=ptc ptcwrapper ptceventqueue
+units_win32=p_ddraw
+units_win64=p_ddraw
 exampledirs=examples
 exampledirs=examples
 
 
 [compiler]
 [compiler]
@@ -15,6 +17,8 @@ exampledirs=examples
 unitdir_go32v2=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa
 unitdir_go32v2=src/dos/base src/dos/cga src/dos/vga src/dos/textfx2 src/dos/timeunit src/dos/vesa
 unitdir_win32=src/win32/directx
 unitdir_win32=src/win32/directx
 unitdir_win64=src/win32/directx
 unitdir_win64=src/win32/directx
+sourcedir_win32=src/win32/directx
+sourcedir_win64=src/win32/directx
 unitdir_wince=src/wince/gapi
 unitdir_wince=src/wince/gapi
 sourcedir=src src/ptcwrapper
 sourcedir=src src/ptcwrapper