paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 23:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed pathes on win32

Browse Source 
git-svn-id: trunk@2075 -
This commit is contained in:
florian 2005-12-29 15:03:58 +00:00
parent d1709eaefb
commit 7b5f6b27fb
2 changed files with 2181 additions and 2183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/base/graph/Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/12/29]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/12]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@ -238,11 +238,16 @@ ifndef USELIBGGI
USELIBGGI=NO
endif
GGIGRAPH_UNIT=ggigraph
GRAPHUNIT_DIR=$(OS_TARGET)
ifeq ($(OS_TARGET),linux)
GRAPHUNIT_DIR=unix
ifeq ($(CPU_TARGET),powerpc64)
GGIGRAPH_UNIT=
endif
endif
ifeq ($(OS_TARGET),freebsd)
GRAPHUNIT_DIR=unix
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=graph $(GGIGRAPH_UNIT)
endif
@ -929,11 +934,6 @@ GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
endif
endif
endif
ifeq ($(CPU_TARGET),powerpc64)
ifeq ($(BINUTILSPREFIX),)
GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
endif
endif
endif
ifndef GCCLIBDIR
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
@ -1751,14 +1751,6 @@ override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD
export FPCEXTCMD
endif
override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
override ACROSSCOMPILE=1
endif
ifdef ACROSSCOMPILE
override FPCOPT+=$(CROSSOPT)
endif
override COMPILER:=$(FPC) $(FPCOPT)
ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS=
@ -2173,7 +2165,7 @@ endif
include inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS) $(UNIXINC)/graph16.inc
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/graph.pp
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp
winmouse$(PPUEXT) : win32/winmouse.pp graph$(PPUEXT)

8
packages/base/graph/Makefile.fpc
View File

@ -50,19 +50,25 @@ USELIBGGI=NO
endif
GGIGRAPH_UNIT=ggigraph
GRAPHUNIT_DIR=$(OS_TARGET)
ifeq ($(OS_TARGET),linux)
GRAPHUNIT_DIR=unix
ifeq ($(CPU_TARGET),powerpc64)
GGIGRAPH_UNIT=
endif
endif
ifeq ($(OS_TARGET),freebsd)
GRAPHUNIT_DIR=unix
endif
[rules]
include inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS) $(UNIXINC)/graph16.inc
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/graph.pp
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp