+ Add graph, wincrt and winmouse units for win64 OS target

git-svn-id: trunk@17306 -
This commit is contained in:
pierre 2011-04-11 10:20:46 +00:00
parent d3d34c61f6
commit 83e0b5207d
2 changed files with 34 additions and 3 deletions

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/11]
#
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 i386-iphonesim 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 i386-iphonesim 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 powerpc-wii 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
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -331,7 +331,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=graph $(GGIGRAPH_UNIT)
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=ptcgraph ptccrt
override TARGET_UNITS+=graph wincrt winmouse ptcgraph ptccrt
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT) ptcgraph ptccrt
@ -456,6 +456,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif
ifeq ($(FULL_TARGET),sparc-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif
@ -643,6 +646,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_OPTIONS+=-S2
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override COMPILER_OPTIONS+=-S2
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_OPTIONS+=-S2
endif
@ -829,6 +835,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc src/unix
endif
@ -1015,6 +1024,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc src/ptcgraph tests examples
endif
@ -1469,6 +1481,11 @@ ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
ifeq ($(OS_TARGET),wii)
EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -2036,6 +2053,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),powerpc-wii)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),sparc-linux)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_HERMES=1
@ -2927,8 +2947,13 @@ include fpcmake.loc
endif
include src/inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
ifeq ($(OS_TARGET),win64)
graph$(PPUEXT) : src/win32/graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) src/win32/graph.pp
else
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
endif
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp
winmouse$(PPUEXT) : src/win32/winmouse.pp graph$(PPUEXT)

View File

@ -28,6 +28,7 @@ units=
units_linux=$(GRAPH_UNIT) $(GGIGRAPH_UNIT) ptcgraph ptccrt
units_freebsd=graph $(GGIGRAPH_UNIT)
units_win32=graph wincrt winmouse
units_win64=graph wincrt winmouse
units_go32v2=graph
units_amiga=graph
units_i386_linux=sdlgraph
@ -92,8 +93,13 @@ endif
include src/inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
ifeq ($(OS_TARGET),win64)
graph$(PPUEXT) : src/win32/graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) src/win32/graph.pp
else
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
endif
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp