CMake: jDoom64 is built by default. Also included more headers.

skyjake · Mar 10, 2011 · 2fffbec · 2fffbec
1 parent 2b1bd0c
commit 2fffbec
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/doomsday/CMakeLists.txt b/doomsday/CMakeLists.txt
@@ -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" OFF)
+OPTION (BUILDJDOOM64 "Optionally build the jDoom64 plugin. Default OFF" 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)
@@ -66,7 +66,7 @@ OPTION (ENABLERANGECHECKING "Turn on internal range checking features. Default O
 OPTION (ENABLEPROFILE "Turn on internal profiling features. Default OFF" OFF)
 OPTION (FINK "Build with FINK on OSX. Default OFF" OFF)
 
-MARK_AS_ADVANCED (BUILDJDOOM64)
+#MARK_AS_ADVANCED (BUILDJDOOM64)
 MARK_AS_ADVANCED (ENABLEMAO)
 MARK_AS_ADVANCED (ENABLENETDEBUG)
 MARK_AS_ADVANCED (ENABLEPROFILE)
@@ -468,7 +468,10 @@ ADD_DEFINITIONS (-D__DOOMSDAY__ )
 
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/engine/api ${CMAKE_SOURCE_DIR}/engine/portable/include )
 
-FILE (GLOB DENG_PORTABLE_SOURCES ${CMAKE_SOURCE_DIR}/engine/portable/src/*.c ${CMAKE_SOURCE_DIR}/engine/portable/include/*.h )
+FILE (GLOB DENG_PORTABLE_SOURCES
+    ${CMAKE_SOURCE_DIR}/engine/portable/src/*.c
+    ${CMAKE_SOURCE_DIR}/engine/portable/include/*.h
+    ${CMAKE_SOURCE_DIR}/engine/api/*.h )
 
 SET ( DENG_PORTABLE_SOURCES ${DENG_PORTABLE_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/common/src/m_fixed.c )
 
@@ -625,6 +628,7 @@ IF (APPLE)
     SET (BUNDLE_BASE Doomsday)
     SET (BUNDLE ${CMAKE_BINARY_DIR}/${BUNDLE_BASE}.app)
     ADD_CUSTOM_COMMAND( TARGET doomsday POST_BUILD
+        COMMAND echo "Updating the ${BUNDLE_BASE}.app bundle."
         COMMAND rm -rf ${BUNDLE}
         COMMAND mkdir -p ${BUNDLE}/Contents/MacOS
         COMMAND cp doomsday ${BUNDLE}/Contents/MacOS/${BUNDLE_BASE}

diff --git a/doomsday/plugins/jdoom/CMakeLists.txt b/doomsday/plugins/jdoom/CMakeLists.txt
@@ -19,7 +19,7 @@
 ##
 ################################################################################
 INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/plugins/common/include )
-FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c)
+FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c ${CMAKE_SOURCE_DIR}/plugins/common/include/*.h )
 
 ################################################################################
 ######################## jDoom Game Plugin  ####################################
@@ -28,7 +28,7 @@ ADD_DEFINITIONS (-D__JDOOM__ )
 
 INCLUDE_DIRECTORIES ( include )
 
-FILE(GLOB JDOOM_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jdoom/src/*.c )
+FILE(GLOB JDOOM_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jdoom/src/*.c ${CMAKE_SOURCE_DIR}/plugins/jdoom/include/*.h )
 
 IF (ENABLEMAO)
 	CREATE_MODULE_AT_ONCE_FILE (${CMAKE_BINARY_DIR}/_jdoom_mao.c ${JDOOM_SOURCES} )

diff --git a/doomsday/plugins/jdoom64/CMakeLists.txt b/doomsday/plugins/jdoom64/CMakeLists.txt
@@ -1,5 +1,6 @@
 ## deng build scripts. 
-## Copyright © 2006 - 2007 Jamie Jones <jamie_jones_au@yahoo.com.au>
+## Copyright (c) 2011 Jaakko Keränen <jaakko.keranen@iki.fi>
+## Copyright (c) 2006 - 2007 Jamie Jones <jamie_jones_au@yahoo.com.au>
 ## This file is licensed under the GNU GPLv3 or any later versions,
 ##
 ## the deng build scripts is free software; you can redistribute it and/or
@@ -20,7 +21,8 @@
 ################################################################################
 
 INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/plugins/common/include )
-FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c)
+FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c
+	${CMAKE_SOURCE_DIR}/plugins/common/include/*.h )
 
 ################################################################################
 ######################## Doom64TC Game Plugin ##################################
@@ -30,7 +32,7 @@ ADD_DEFINITIONS (-D__JDOOM64__ )
 
 INCLUDE_DIRECTORIES ( include )
 
-FILE(GLOB DOOM64TC_SOURCES src/*.c)
+FILE(GLOB DOOM64TC_SOURCES src/*.c include/*.h )
 
 ADD_LIBRARY (jdoom64 SHARED ${DOOM64TC_SOURCES} ${COMMON_PLUGIN_SOURCES} )
 

diff --git a/doomsday/plugins/jheretic/CMakeLists.txt b/doomsday/plugins/jheretic/CMakeLists.txt
@@ -21,7 +21,7 @@
 ################################################################################
 
 INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/plugins/common/include )
-FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c)
+FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c ${CMAKE_SOURCE_DIR}/plugins/common/include/*.h )
 
 ################################################################################
 ######################## jHeretic Game Plugin  ####################################
@@ -55,7 +55,7 @@ IF (ENABLEMAO)
 	${CMAKE_SOURCE_DIR}/plugins/jheretic/src/p_spec.c
 	${CMAKE_SOURCE_DIR}/plugins/jheretic/src/st_stuff.c )
 ELSE (ENABLEMAO)
-	FILE(GLOB JHERETIC_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jheretic/src/*.c )
+	FILE(GLOB JHERETIC_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jheretic/src/*.c ${CMAKE_SOURCE_DIR}/plugins/jheretic/include/*.h )
 ENDIF (ENABLEMAO)
 
 IF (ENABLEMAO)

diff --git a/doomsday/plugins/jhexen/CMakeLists.txt b/doomsday/plugins/jhexen/CMakeLists.txt
@@ -20,7 +20,7 @@
 ################################################################################
 
 INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/plugins/common/include )
-FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c)
+FILE(GLOB COMMON_PLUGIN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/common/src/*.c ${CMAKE_SOURCE_DIR}/plugins/common/include/*.h )
 
 ################################################################################
 ######################## External LZSS Files ###################################
@@ -75,7 +75,7 @@ IF (ENABLEMAO)
 	${CMAKE_SOURCE_DIR}/plugins/jhexen/src/p_setup.c
 	${CMAKE_SOURCE_DIR}/plugins/jhexen/src/sn_sonix.c )
 ELSE (ENABLEMAO)
-	FILE(GLOB JHEXEN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jhexen/src/*.c)
+	FILE(GLOB JHEXEN_SOURCES ${CMAKE_SOURCE_DIR}/plugins/jhexen/src/*.c ${CMAKE_SOURCE_DIR}/plugins/jhexen/include/*.h )
 ENDIF (ENABLEMAO)
 
 IF (ENABLEMAO)

diff --git a/doomsday/plugins/wadmapconverter/CMakeLists.txt b/doomsday/plugins/wadmapconverter/CMakeLists.txt
@@ -23,7 +23,7 @@
 ######################## WAD Map Converter Plugin ##############################
 
 INCLUDE_DIRECTORIES ( include )
-FILE(GLOB WADMAPCONVERTER_SOURCES src/*.c)
+FILE(GLOB WADMAPCONVERTER_SOURCES src/*.c include/*.h )
 ADD_LIBRARY (dpwadmapconverter SHARED ${WADMAPCONVERTER_SOURCES})
 
 #IF (APPLE)