Ticket #516: speed-dreams-2.0.0.patch

cmake/macros.cmake

@@ -869 +869 @@
         ENDIF(JPEG_FOUND)
 ENDMACRO(ADD_JPEG_LIBRARY TARGET)
 
+IF(NOT BEOS)
+
 MACRO(ADD_X11_INCLUDEDIR)
         FIND_PACKAGE(X11)
 
@@ -916 +918 @@
         ENDIF(X11_Xrandr_LIB)
 ENDMACRO(ADD_XRANDR_LIBRARY TARGET)
 
+ENDIF(NOT BEOS)
+
 #Some unix compilers need libdl
 MACRO(ADD_DL_LIBRARY TARGET)
-        IF(UNIX)
+        IF(UNIX AND NOT BEOS)
                 FIND_LIBRARY(LIBDL_LIB dl "")
 
                 IF(LIBDL_LIB)
                         TARGET_LINK_LIBRARIES(${TARGET} ${LIBDL_LIB})
                 ENDIF(LIBDL_LIB)
                 #MESSAGE(STATUS LIBDL = ${LIBDL_LIB})
-        ENDIF(UNIX)
+        ELSEIF(UNIX AND NOT BEOS)
+                FIND_LIBRARY(LIBDL_LIB network "")
+
+                IF(LIBDL_LIB)
+                        TARGET_LINK_LIBRARIES(${TARGET} ${LIBDL_LIB})
+                ENDIF(LIBDL_LIB)
+                #MESSAGE(STATUS LIBDL = ${LIBDL_LIB})
+        ENDIF(UNIX AND NOT BEOS)
 ENDMACRO(ADD_DL_LIBRARY TARGET)
 
 MACRO(ADD_SD_DEFINITIONS)

data/data/icons/icon.rdef

@@ +1 @@
+
+resource(<your resource id here>) #'VICN' array {
+        $"6E636966040500020006033D5062388E16BB07363FED7E4A24CEC2FA0800FFFF"
+        $"FF7AC4C4DBCEFFFFFF020006033BDEB6376D73B7E6323C3385484A5949F98D00"
+        $"EC7C7983D93017FFCEC500020006023AC0000000000000004000004AF0000000"
+        $"00002A9B0CFFEDEE8106060CAFFFF4C4B727C50228C46C26C5D524C50924C6A1"
+        $"24C71B27C89F24C62621C82421C42821C25327C2A524C1E62BC52B2EC4E02DC5"
+        $"53B8CA4B304D304B3039344A344A344F34C78F2EC73D31C7FC2A060413363039"
+        $"303630213437060ED33FE20F3C29C093293C29212FBC522FBC522FBCFB2FBD4E"
+        $"31BD6CB955BD4E31BBD13FBBD13FBBB3BFCABA6941BB1241BA6941B937BA7D35"
+        $"B61B234734473447BD6347C0333FBFBBC11CC0333FC1B031C1B031C228B80308"
+        $"034E3755BD8F4E3E080347374EBD8F473E0803403747BD8F403E0C0A00010030"
+        $"242C01178400040A01010020242C0A00010230242C01178400040A0201022024"
+        $"2C0A00010130242C01178400040A01010120242C0A00010330242C0117862204"
+        $"0A00010430242C01178622040A00010530242C01178622040A03010330242C01"
+        $"178222040A03010430242C01178222040A03010530242C0117822204"
+};

src/libs/tgfclient/CMakeLists.txt

@@ -54 +54 @@
         TARGET_LINK_LIBRARIES(tgfclient winmm)
 ENDIF(WIN32)
 
-IF(UNIX)
+IF(UNIX AND NOT BEOS)
         ADD_X11_LIBRARY(tgfclient)
         IF(OPTION_XRANDR)
                 ADD_XRANDR_LIBRARY(tgfclient)
         ENDIF(OPTION_XRANDR)
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT BEOS)
 
 IF(WIN32)
         ADD_DEFINITIONS(-DTGFCLIENT_DLL)

src/libs/tgfclient/guifont.cpp

@@ -27 +27 @@
 #include <machine/endian.h>
 #endif
 
-#ifdef LINUX
+#if defined(LINUX) || defined(__HAIKU__)
 #include <endian.h>
 #endif
 
@@ -44 +44 @@
 const char *keySize[4] = { "size big", "size large", "size medium", "size small" };
 
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
 void swap32(unsigned int *p, unsigned int size)
 {
@@ -121 +121 @@
         //fread(font, sizeof(GLFONT), 1, Input);
         fread(font, 24, 1, Input); // for IA64...
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
         swap32((unsigned int *) font, 24);
 #endif
@@ -141 +141 @@
     //Read glFont characters
         fread(font->Char, sizeof(GLFONTCHAR), Num, Input);
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__HAIKU__)
 #if BYTE_ORDER == BIG_ENDIAN
         swap32((unsigned int *) font->Char, sizeof(GLFONTCHAR) * Num);
 #endif

src/linux/linuxspec.cpp

@@ -30 +30 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#if defined(__HAIKU__)
+#include <sys/param.h>
+#endif
+
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #include <sys/param.h>
 #include <sys/sysctl.h>
@@ -686 +690 @@
 * Remarks
 *    
 */
+#if !defined(__HAIKU__)
+
 std::string cpuSet2String(const cpu_set_t* pCPUSet)
 {
         std::ostringstream ossCPUSet;
@@ -699 +705 @@
         
         return ossCPUSet.str();
 }
+#endif
 
 bool
 linuxSetThreadAffinity(int nCPUId)

src/tools/nfsperf/CMakeLists.txt

@@ -14 +14 @@
 
 ADD_SDLIB_LIBRARY(${SD_TOOLS_EXECPREFIX}nfsperf tgf txml)
 
-IF(UNIX)
+IF(UNIX AND NOT BEOS)
   TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}nfsperf dl)
-ENDIF(UNIX)
+ELSEIF(UNIX AND NOT BEOS)
+  TARGET_LINK_LIBRARIES(${SD_TOOLS_EXECPREFIX}nfsperf network)
+ENDIF(UNIX AND NOT BEOS)
 
 SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}nfsperf)

src/tools/texmapper/CMakeLists.txt

@@ -22 +22 @@
 
 ADD_PNG_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)
 
-IF(UNIX)
+IF(UNIX AND NOT BEOS)
         ADD_X11_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)
         ADD_XRANDR_LIBRARY(${SD_TOOLS_EXECPREFIX}texmapper)
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT BEOS)
 
 SD_INSTALL_FILES(BIN TARGETS ${SD_TOOLS_EXECPREFIX}texmapper)
 

src/tools/xmlversion/CMakeLists.txt

@@ -21 +21 @@
         ADD_SDLIB_LIBRARY(xmlversion tgf txml)
 ENDIF(CMAKE_SKIP_RPATH OR CMAKE_SKIP_BUILD_RPATH)
 
-IF(UNIX)
+IF(UNIX AND NOT BEOS)
   TARGET_LINK_LIBRARIES(xmlversion dl)
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT BEOS)
 
 GET_TARGET_PROPERTY(XMLVERSION_BUILDLOC xmlversion LOCATION)
 FILE(WRITE ${CMAKE_BINARY_DIR}/xmlversion_loc.txt ${XMLVERSION_BUILDLOC})