Ticket #406: gemrb-0.6.2-git.patch

CMakeLists.txt

@@ -140 +140 @@
         MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
 ENDIF()
 
-IF(UNIX)
+IF(UNIX AND NOT BEOS)
         FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
         IF(DLD_LIBRARY_PATH)
                 MESSAGE(STATUS "Looking for dl library: found")
@@ -150 +150 @@
 
         SET(CMAKE_THREAD_PREFER_PTHREAD true)
         FIND_PACKAGE(Threads REQUIRED)
-ENDIF(UNIX)
+ENDIF(UNIX AND NOT BEOS)
 
 INCLUDE(FindOpenAL)
 IF(OPENAL_FOUND)

gemrb/plugins/BIKPlayer/BIKPlayer.cpp

@@ -1379 +1379 @@
         const uint8_t *scan;
         const uint32_t *quant;
         int xoff, yoff;
+#if !defined(__HAIKU__)
 #pragma pack(push,16)
+#endif
         DCTELEM block[64];
+#if !defined(__HAIKU__)
 #pragma pack(pop)
+#endif
 
         int bits = data_size*8;
         v_gb.init_get_bits((uint8_t *) data, bits);

gemrb/plugins/BIKPlayer/BIKPlayer.h

@@ -151 +151 @@
         bool s_audio;
         int s_stream;  //openal stream handle
 
+#if !defined(__HAIKU__)
 #pragma pack(push,16)
+#endif
         FFTSample s_coeffs[BINK_BLOCK_MAX_SIZE];
         short s_previous[BINK_BLOCK_MAX_SIZE / 16];  ///< coeffs from previous audio block
+#if !defined(__HAIKU__)
 #pragma pack(pop)
+#endif
 
         float *s_coeffs_ptr[MAX_CHANNELS]; ///< pointers to the coeffs arrays for float_to_int16_interleave
 

gemrb/plugins/GUIScript/CMakeLists.txt

@@ -2 +2 @@
 
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 ADD_GEMRB_PLUGIN (GUIScript GUIScript.cpp PythonHelpers.cpp)
-TARGET_LINK_LIBRARIES( GUIScript ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl)
+TARGET_LINK_LIBRARIES( GUIScript ${PYTHON_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )