[haiku-commits] BRANCH xyzzy-github.x86_64 - build/jam src/preferences/appearance src/add-ons/translators/shared

  • From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 18 Nov 2012 17:49:02 +0100 (CET)

added 1 changeset to branch 'refs/remotes/xyzzy-github/x86_64'
old head: 11c9f9a1d649c006f9066ae9436372ab75728c4b
new head: 2913b1dbd264f80e37d485f0dc40f5dcf63c14b2
overview: https://github.com/xyzzy51/haiku/compare/11c9f9a...2913b1d

----------------------------------------------------------------------------

2913b1d: Compilation fixes for x86_64.

                                      [ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      2913b1dbd264f80e37d485f0dc40f5dcf63c14b2
Author:      Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date:        Sun Nov 18 15:48:47 2012 UTC

----------------------------------------------------------------------------

4 files changed, 39 insertions(+), 11 deletions(-)
build/jam/Haiku64Image                           | 32 +++++++++++++++++---
build/jam/OptionalBuildFeatures                  | 12 ++++++--
.../translators/shared/BaseTranslator.cpp        |  2 +-
.../appearance/LookAndFeelSettingsView.cpp       |  4 +--

----------------------------------------------------------------------------

diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index 351933d..7e1611f 100644
--- a/build/jam/Haiku64Image
+++ b/build/jam/Haiku64Image
@@ -47,15 +47,19 @@ SYSTEM_PREFERENCES = Appearance Backgrounds 
<preference>Deskbar FileTypes
 
 SYSTEM_DEMOS = ;
 
-SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libjpeg.so libnetwork.so
-       libpng.so <revisioned>libroot.so libroot-addon-icu.so
+SYSTEM_LIBS = libbe.so libbnetapi.so libdebug.so libnetwork.so
+       <revisioned>libroot.so libroot-addon-icu.so
        libtextencoding.so libtiff.so libtracker.so libtranslation.so
-       libz.so
        $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
-       $(HAIKU_FREETYPE_CURRENT_LIB)
 ;
 
-PRIVATE_SYSTEM_LIBS = libilmimf.so ;
+PRIVATE_SYSTEM_LIBS =
+       $(HAIKU_JPEG_CURRENT_LIB)
+       $(HAIKU_LIBPNG_CURRENT_LIB)
+       $(HAIKU_ZLIB_CURRENT_LIB) 
+       $(HAIKU_FREETYPE_CURRENT_LIB)
+       libilmimf.so
+;
 
 SYSTEM_SERVERS = app_server debug_server input_server mount_server
        net_server notification_server registrar syslog_daemon
@@ -133,6 +137,24 @@ AddSymlinkToHaikuHybridImage system lib : 
$(HAIKU_FREETYPE_CURRENT_LIB:BS)
 AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LINK)
        : libfreetype.so : : true ;
 
+# libpng.so links to the current libpng
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_LIBPNG_CURRENT_LIB:BS)
+       : $(HAIKU_LIBPNG_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_LIBPNG_CURRENT_LINK)
+       : libpng.so : : true ;
+
+# libjpeg.so links to the current libjpeg
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_JPEG_CURRENT_LIB:BS)
+       : $(HAIKU_JPEG_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_JPEG_CURRENT_LINK)
+       : libjpeg.so : : true ;
+
+# zlib.so links to the current zlib
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_ZLIB_CURRENT_LIB:BS)
+       : $(HAIKU_ZLIB_CURRENT_LINK) : : true ;
+AddSymlinkToHaikuHybridImage system lib : $(HAIKU_ZLIB_CURRENT_LINK)
+       : libz.so : : true ;
+
 # servers
 AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
 
diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 5e81128..4cabeb3 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -539,9 +539,11 @@ if $(HAIKU_BUILD_FEATURE_WEBKIT) {
 
 # libpng
 local libpngBaseURL = $(baseURL)/lib ;
-if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
        if $(TARGET_ARCH) = ppc {
                HAIKU_LIBPNG_FILE = libpng-1.5.12-ppc-gcc4-2012-08-27.zip ;
+       } else if $(TARGET_ARCH) = x86_64 {
+               HAIKU_LIBPNG_FILE = libpng-1.5.12-x86_64-2012-11-18.zip ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                HAIKU_LIBPNG_FILE = libpng-1.5.12-x86-gcc4-2012-08-23.zip ;
        } else {
@@ -579,9 +581,11 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
 
 # jpeg
 local jpegBaseURL = $(baseURL)/lib ;
-if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
        if $(TARGET_ARCH) = ppc {
                HAIKU_JPEG_FILE = jpeg-8d-ppc-gcc4-2012-08-27.zip ;
+       } else if $(TARGET_ARCH) = x86_64 {
+               HAIKU_JPEG_FILE = jpeg-8d-x86_64-2012-11-18.zip ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                HAIKU_JPEG_FILE = jpeg-8d-x86-gcc4-2012-08-23.zip ;
        } else {
@@ -619,9 +623,11 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
 
 # zlib
 local zlibBaseURL = $(baseURL)/lib ;
-if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
        if $(TARGET_ARCH) = ppc {
                HAIKU_ZLIB_FILE = zlib-1.2.7-ppc-gcc4-2012-10-30.zip ;
+       } else if $(TARGET_ARCH) = x86_64 {
+               HAIKU_ZLIB_FILE = zlib-1.2.7-x86_64-2012-11-18.zip ;
        } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
                HAIKU_ZLIB_FILE = zlib-1.2.7-x86-gcc4-2012-10-30.zip ;
        } else {
diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp 
b/src/add-ons/translators/shared/BaseTranslator.cpp
index 3397a38..b8eb064 100644
--- a/src/add-ons/translators/shared/BaseTranslator.cpp
+++ b/src/add-ons/translators/shared/BaseTranslator.cpp
@@ -549,7 +549,7 @@ BaseTranslator::translate_from_bits_to_bits(BPositionIO 
*inSource,
                                if (writ < 0)
                                        break;
                                remaining -= static_cast<uint32>(writ);
-                               rd = inSource->Read(buf, std::min(1024UL, 
+                               rd = inSource->Read(buf, std::min((uint32)1024,
                                        remaining));
                        }
 
diff --git a/src/preferences/appearance/LookAndFeelSettingsView.cpp 
b/src/preferences/appearance/LookAndFeelSettingsView.cpp
index 5c7bd75..5a6b12c 100644
--- a/src/preferences/appearance/LookAndFeelSettingsView.cpp
+++ b/src/preferences/appearance/LookAndFeelSettingsView.cpp
@@ -226,8 +226,8 @@ LookAndFeelSettingsView::_BuildDecorMenu()
        for (int32 i = 0; i < count; ++i) {
                DecorInfo* decorator = fDecorUtility.DecoratorAt(i);
                if (decorator == NULL) {
-                       fprintf(stderr, "Decorator : error NULL entry @ %li / 
%li\n",
-                               i, count);
+                       fprintf(stderr, "Decorator : error NULL entry @ %" 
B_PRId32
+                               " / %" B_PRId32 "\n", i, count);
                        continue;
                }
 


Other related posts:

  • » [haiku-commits] BRANCH xyzzy-github.x86_64 - build/jam src/preferences/appearance src/add-ons/translators/shared - xyzzy-github . x86_64