From 5e1643bf25aa4d7c1bfbfa5e93dfe19684c14d92 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 15 Jul 2008 19:10:32 +0000 Subject: [PATCH] do not add X11 path when building carbon git-svn-id: trunk@15787 - --- ide/Makefile | 4 +++- ide/Makefile.fpc | 2 ++ tools/apiwizz/Makefile | 2 ++ tools/apiwizz/Makefile.fpc | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ide/Makefile b/ide/Makefile index dccfe15dc4..69a58736a2 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/19] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/07/15] # 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 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-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 @@ -273,8 +273,10 @@ endif endif export LCL_PLATFORM ifeq ($(OS_TARGET),darwin) +ifneq ($(LCL_PLATFORM),carbon) LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib endif +endif ifndef LAZARUS_CONFIG_DIR ifneq ($(findstring $(OS_TARGET),win32 win64),) LAZARUS_CONFIG_DIR=.. diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc index c714873a66..eb18bf7610 100644 --- a/ide/Makefile.fpc +++ b/ide/Makefile.fpc @@ -72,8 +72,10 @@ export LCL_PLATFORM # # LibPaths ifeq ($(OS_TARGET),darwin) +ifneq ($(LCL_PLATFORM),carbon) LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib endif +endif # # user config diff --git a/tools/apiwizz/Makefile b/tools/apiwizz/Makefile index d7d76950db..14e3efe9be 100644 --- a/tools/apiwizz/Makefile +++ b/tools/apiwizz/Makefile @@ -266,8 +266,10 @@ endif endif export LCL_PLATFORM ifeq ($(OS_TARGET),darwin) +ifneq ($(LCL_PLATFORM),carbon) LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib endif +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=apiwizz endif diff --git a/tools/apiwizz/Makefile.fpc b/tools/apiwizz/Makefile.fpc index 1a7d340620..6f45823139 100644 --- a/tools/apiwizz/Makefile.fpc +++ b/tools/apiwizz/Makefile.fpc @@ -43,8 +43,10 @@ endif export LCL_PLATFORM ifeq ($(OS_TARGET),darwin) +ifneq ($(LCL_PLATFORM),carbon) LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib endif +endif [rules]