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

* Prefixed the INCLUDE_GPL_ADDONS variable by "HAIKU_". configure needs to

Browse Source 
be run again or generated/build/BuildConfig needs to be adjusted manually.
* Removed bochs debug hack.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34721 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-12-20 13:55:45 +00:00
parent 32a0e3810e
commit 0b58d8440c
10 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+4 -6
View File
@@ -275,10 +275,8 @@ SetIncludePropertiesVariables HAIKU ;
HAIKU_ASFLAGS = ;
# C/C++ flags
HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) ;
HAIKU_KERNEL_CCFLAGS += -finline -fno-builtin ;
HAIKU_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions ;
HAIKU_KERNEL_DEFINES += _KERNEL_MODE ;
if $(HAIKU_GCC_VERSION[1]) >= 3 {
@@ -561,9 +559,9 @@ if $(HOST_PLATFORM) != cygwin {
}
HOST_KERNEL_CCFLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
-D_KERNEL_MODE ;
HOST_KERNEL_C++FLAGS += $(HOST_GCC_BASE_FLAGS) -finline -fno-builtin
-fno-exceptions -DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
-fno-exceptions -D_KERNEL_MODE ;
HOST_KERNEL_DEFINES += _KERNEL_MODE ;
HOST_KERNEL_PIC_CCFLAGS = -fno-pic ;
build/jam/FloppyBootImage
+1 -1
View File
@@ -12,7 +12,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
build/jam/HaikuImage
+2 -2
View File
@@ -14,7 +14,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}
@@ -164,7 +164,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
pegasus $(X86_ONLY)rtl8139 rtl8169 $(X86_ONLY)rtl81xx sis900
$(X86_ONLY)via_rhine wb840 $(X86_ONLY)ipro100 $(X86_ONLY)nforce
#vlance
$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x
$(X86_ONLY)marvell_yukon $(X86_ONLY)syskonnect $(X86_ONLY)vt612x
$(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx
usb_ecm usb_asix
build/jam/MiscRules
+1 -1
View File
@@ -62,7 +62,7 @@ rule SubIncludeGPL
{
# SubInclude rule that can be used to conditionally include GPL licensed
# add-ons
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
SubInclude $(1) ;
}
}
build/jam/NetBootArchive
+1 -1
View File
@@ -10,7 +10,7 @@ if $(TARGET_ARCH) = x86 {
}
local GPL_ONLY = ;
if $(INCLUDE_GPL_ADDONS) = 1 {
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
GPL_ONLY = "" ;
}