Browse Source

+ enabled build of ptcgraph on win32

git-svn-id: trunk@16030 -
nickysn 15 years ago
parent
commit
9e0e05c098
4 changed files with 10 additions and 4 deletions
  1. 1 1
      packages/Makefile
  2. 1 1
      packages/Makefile.fpc
  3. 5 2
      packages/graph/Makefile
  4. 3 0
      packages/graph/Makefile.fpc

+ 1 - 1
packages/Makefile

@@ -9535,7 +9535,7 @@ graph_smart: sdl_smart
 graph_debug: sdl_debug
 graph_release: sdl_release
 endif
-ifneq ($(findstring $(OS_TARGET),linux),)
+ifneq ($(findstring $(OS_TARGET),linux win32),)
 graph_all: ptc_all
 graph_shared: ptc_shared
 graph_smart: ptc_smart

+ 1 - 1
packages/Makefile.fpc

@@ -244,7 +244,7 @@ graph_debug: sdl_debug
 graph_release: sdl_release
 endif
 
-ifneq ($(findstring $(OS_TARGET),linux),)
+ifneq ($(findstring $(OS_TARGET),linux win32),)
 graph_all: ptc_all
 graph_shared: ptc_shared
 graph_smart: ptc_smart

+ 5 - 2
packages/graph/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
 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
@@ -295,7 +295,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_UNITS+=graph
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=graph wincrt winmouse sdlgraph
+override TARGET_UNITS+=graph wincrt winmouse sdlgraph ptcgraph ptccrt
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 override TARGET_UNITS+=graph $(GGIGRAPH_UNIT) sdlgraph
@@ -1893,6 +1893,9 @@ REQUIRE_PACKAGES_RTL=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_HERMES=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_PTC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_SDL=1

+ 3 - 0
packages/graph/Makefile.fpc

@@ -9,12 +9,14 @@ version=2.5.1
 [require]
 libc=y
 packages_linux=ptc
+packages_win32=ptc
 packages_linux_i386=sdl
 packages_linux_powerpc=sdl
 packages_freebsd_i386=sdl
 packages_win32=sdl
 packages_darwin_powerpc=sdl
 packages_darwin_i386=sdl
+packages_win32=sdl
 
 # clean package units
 [clean]
@@ -34,6 +36,7 @@ units_i386_freebsd=sdlgraph
 units_win32=sdlgraph
 units_powerpc_darwin=sdlgraph
 units_i386_darwin=sdlgraph
+units_win32=ptcgraph ptccrt
 
 [compiler]
 options=-S2