i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The previous change overwrote the $defines variable, although both defines should

Browse Source 
be there at the same time.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12133 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-03-29 20:37:30 +00:00
parent da4526cdcf
commit d19337ad86
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Jamfile
+5 -3
View File
@@ -15,9 +15,9 @@ UseFreeTypeHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing ] ;
if ( $(TARGET_PLATFORM) = haiku ) { if ( $(TARGET_PLATFORM) = haiku ) {
# This overrides the definition in private/servers/app/ServerConfig.h # This overrides the definitions in private/servers/app/ServerConfig.h
defines = [ FDefines DISPLAYDRIVER=HWDRIVER ] ; defines = [ FDefines DISPLAYDRIVER=HWDRIVER TEST_MODE=0 ] ;
defines = [ FDefines TEST_MODE=0 ] ;
SubDirCcFlags $(defines) ; SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ; SubDirC++Flags $(defines) ;
@@ -103,6 +103,7 @@ Server app_server :
# link libraries for app_server and libappserver.so # link libraries for app_server and libappserver.so
if $(TARGET_PLATFORM) = haiku { if $(TARGET_PLATFORM) = haiku {
# link for Haiku
LinkSharedOSLibs libappserver.so : LinkSharedOSLibs libappserver.so :
libroot.so libbe.so libfreetype.so ; libroot.so libbe.so libfreetype.so ;
@@ -112,6 +113,7 @@ if $(TARGET_PLATFORM) = haiku {
libappserver.so libfreetype.so libtextencoding.so ; libappserver.so libfreetype.so libtextencoding.so ;
} else { } else {
# link as test application under R5
LINKFLAGS on app_server ?= $(LINKFLAGS) ; LINKFLAGS on app_server ?= $(LINKFLAGS) ;
LINKFLAGS on app_server += -lbe ; LINKFLAGS on app_server += -lbe ;