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

Merge remote-tracking branch 'haiku/master' into package-management

Browse Source 
Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalPackageDependencies
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/translators/icns/Jamfile
	src/add-ons/translators/jpeg/Jamfile
This commit is contained in:
Ingo Weinhold
2013-07-08 14:01:00 +02:00
parent 2f3dc946cd 5d4ef3e417
commit 7e78b434f4
438 changed files with 15612 additions and 25171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/locale/Jamfile
+3
View File
@@ -15,6 +15,9 @@ local localetools =
# Due to the use of STL fstream open() mapping the function names via macro
# name doesn't work.
DEFINES += _HAIKU_BUILD_DONT_REMAP_FD_FUNCTIONS ;
# We link against the host libbe.so which could also contain this class, so
# rename it for locale tools
DEFINES += DefaultCatalog=ToolsDefaultCatalog ;
USES_BE_API on $(localetools) = true ;