Skip to content

Commit

Permalink
CMake: Fixed jDoom64 build configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Mar 11, 2011
1 parent 5725ec3 commit d3db944
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
9 changes: 5 additions & 4 deletions doomsday/CMakeLists.txt
Expand Up @@ -55,7 +55,7 @@ SET(BUILD_SHARED_LIBS ON)
OPTION (BUILDJDOOM "Optionally build the jDoom plugin. Default ON" ON)
OPTION (BUILDJHERETIC "Optionally build the jHeretic plugin. Default ON" ON)
OPTION (BUILDJHEXEN "Optionally build the jHexen plugin. Default ON" ON)
OPTION (BUILDJDOOM64 "Optionally build the jDoom64 plugin. Default OFF" ON)
OPTION (BUILDJDOOM64 "Optionally build the jDoom64 plugin. Default ON" ON)
OPTION (BUILDWADMAPCONVERT "Optionally build the WAD Map Converter plugin. Default ON" ON)
OPTION (BUILDOPENAL "Optionally build the OpenAL plugin. Default OFF" OFF)
OPTION (BUILDDEDICATED "Build as a dedicated server. Default OFF" OFF)
Expand Down Expand Up @@ -704,7 +704,8 @@ IF (BUILDJHEXEN)
INSTALL(FILES ${DENG_JHEXEN_DATA} DESTINATION ${DATA_DEST}/jhexen )
ENDIF (BUILDJHEXEN)

IF (BUILDJDOOM64)
INSTALL(FILES ${DENG_JDOOM64_DATA} DESTINATION ${DATA_DEST}/jdoom64 )
ENDIF (BUILDJDOOM64)
# jDoom64 not distributed at the moment.
#IF (BUILDJDOOM64)
# INSTALL(FILES ${DENG_JDOOM64_DATA} DESTINATION ${DATA_DEST}/jdoom64 )
#ENDIF (BUILDJDOOM64)

11 changes: 4 additions & 7 deletions doomsday/plugins/jdoom64/CMakeLists.txt
Expand Up @@ -36,12 +36,9 @@ FILE(GLOB DOOM64TC_SOURCES src/*.c include/*.h )

ADD_LIBRARY (jdoom64 SHARED ${DOOM64TC_SOURCES} ${COMMON_PLUGIN_SOURCES} )

IF (APPLE)
SET_TARGET_PROPERTIES (jdoom64 PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -bundle -bundle_loader doomsday")
ENDIF (APPLE)

################################################################################
######################## Install Targets ######################################
INSTALL(TARGETS jdoom64
RUNTIME DESTINATION ${bindir}
LIBRARY DESTINATION ${libdir} )
# jDoom64 not distributed at the moment.
#INSTALL(TARGETS jdoom64
# RUNTIME DESTINATION ${bindir}
# LIBRARY DESTINATION ${libdir} )

0 comments on commit d3db944

Please sign in to comment.