Skip to content

Commit

Permalink
Fix haiku build errors, add haiku shell script
Browse files Browse the repository at this point in the history
  • Loading branch information
cxong committed Oct 21, 2013
1 parent 4cd2aea commit c3ff909
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ INSTALL(DIRECTORY
${SOURCE_DIRECTORY}/sounds
DESTINATION ${INSTALL_PREFIX})
INSTALL(FILES ${SOURCE_DIRECTORY}/cdogs_icon.bmp ${SOURCE_DIRECTORY}/README.md DESTINATION ${INSTALL_PREFIX})
IF(UNIX AND NOT APPLE)
IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
INSTALL(
FILES ${SOURCE_DIRECTORY}/build/linux/cdogs-sdl
DESTINATION ${LINKDIR}
Expand Down Expand Up @@ -204,6 +204,12 @@ elseif(APPLE)
set(CPACK_SYSTEM_NAME "OSX")
set(CPACK_PACKAGE_ICON
"${CMAKE_CURRENT_BINARY_DIR}/build/macosx/cdogs-icon.icns")
elseif(BEOS OR HAIKU)
set(CPACK_GENERATOR TGZ)
install(
FILES ${SOURCE_DIRECTORY}/build/haiku/cdogs-sdl.sh
DESTINATION ${INSTALL_PREFIX}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ELSE()
SET(CPACK_GENERATOR TGZ)
ENDIF()
Expand Down
3 changes: 3 additions & 0 deletions build/haiku/cdogs-sdl.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
DIR="$( cd "$( dirname "$0" )" && pwd )"
cd "$DIR"/bin && ./cdogs-sdl
6 changes: 4 additions & 2 deletions src/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
if(MSVC)
add_definitions(-wd"4127" -wd"4102")
else()
add_definitions(-Wno-unused-label)
set(EXTRA_LIBRARIES "m")
if(NOT BEOS AND NOT HAIKU)
add_definitions(-Wno-unused-label)
set(EXTRA_LIBRARIES "m")
endif()
endif()

add_subdirectory(cbehave)
Expand Down

0 comments on commit c3ff909

Please sign in to comment.