From d19337ad86e0cb5a05b9b838671463191c2eb65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 29 Mar 2005 20:37:30 +0000 Subject: [PATCH] The previous change overwrote the $defines variable, although both defines should be there at the same time. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12133 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Jamfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile index 0f3cbb3690..dc7e96affa 100644 --- a/src/servers/app/Jamfile +++ b/src/servers/app/Jamfile @@ -15,9 +15,9 @@ UseFreeTypeHeaders ; SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing ] ; if ( $(TARGET_PLATFORM) = haiku ) { - # This overrides the definition in private/servers/app/ServerConfig.h - defines = [ FDefines DISPLAYDRIVER=HWDRIVER ] ; - defines = [ FDefines TEST_MODE=0 ] ; + # This overrides the definitions in private/servers/app/ServerConfig.h + defines = [ FDefines DISPLAYDRIVER=HWDRIVER TEST_MODE=0 ] ; + SubDirCcFlags $(defines) ; SubDirC++Flags $(defines) ; @@ -103,6 +103,7 @@ Server app_server : # link libraries for app_server and libappserver.so if $(TARGET_PLATFORM) = haiku { + # link for Haiku LinkSharedOSLibs libappserver.so : libroot.so libbe.so libfreetype.so ; @@ -112,6 +113,7 @@ if $(TARGET_PLATFORM) = haiku { libappserver.so libfreetype.so libtextencoding.so ; } else { + # link as test application under R5 LINKFLAGS on app_server ?= $(LINKFLAGS) ; LINKFLAGS on app_server += -lbe ;