opensonic-svn/CMakeLists.txt.diff

   1 --- CMakeLists.txt      2009-07-22 01:54:28.000000000 -0400
   2 +++ CMakeLists.txt.ok   2009-11-22 08:20:16.444138654 -0500
   3 @@ -54,7 +54,7 @@
   4
   5
   6  # We need some libraries...
   7 -FIND_LIBRARY(LALLEG NAMES alleg PATH "$ENV{CMAKE_LIBRARY_PATH}")
   8 +FIND_LIBRARY(LALLEG NAMES alleg_unsharable PATH "$ENV{CMAKE_LIBRARY_PATH}")
   9  IF(NOT LALLEG)
  10    MESSAGE(FATAL_ERROR "Fatal error: lib Allegro not found! Please read the docs for more information.")
  11  ELSE(NOT LALLEG)
  12 @@ -161,9 +161,8 @@
  13    SET(LAUNCHER_SRCS ${LAUNCHER_SRCS} src/iconlin.c)
  14    ADD_EXECUTABLE(${GAME_BIN} ${GAME_SRCS})
  15    ADD_EXECUTABLE(${LAUNCHER_BIN} ${LAUNCHER_SRCS})
  16 -  SET_TARGET_PROPERTIES(${GAME_BIN} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS})
  17 -  TARGET_LINK_LIBRARIES(${GAME_BIN} m ${LOGG_LIBS} ${DUMB_LIBS} alpng)
  18 -  SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS})
  19 +  TARGET_LINK_LIBRARIES(${GAME_BIN} m ${LOGG_LIBS} ${DUMB_LIBS} ${ALLEGRO_UNIX_LIBS} alpng)
  20 +  TARGET_LINK_LIBRARIES(${LAUNCHER_BIN} ${ALLEGRO_UNIX_LIBS})
  21    SET_TARGET_PROPERTIES(${GAME_BIN} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS}")
  22    SET_TARGET_PROPERTIES(${LAUNCHER_BIN} PROPERTIES COMPILE_FLAGS "-Wall -O2")
  23  ENDIF(UNIX)