Compile q3map2

diff --git a/cmake/FindGLIB.cmake b/cmake/FindGLIB.cmake
new file mode 100644 (file)
index 0000000..e82a39b
--- /dev/null
+++ b/cmake/FindGLIB.cmake
@@ -0,0 +1,5 @@
+include(FindPkgConfig OPTIONAL)
+if(PKG_CONFIG_FOUND)
+    include(FindPkgConfig)
+    pkg_check_modules(GLIB glib-2.0)
+endif()

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 3c2825defa54a039190b9d39cfbbd89bc81a2985..81216495f2c802c84e6b003e7dd58ef7bddaff65 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,5 +1,9 @@
 # Todo split further and actually compile the tools
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+
+add_subdirectory(quake3)
+
 set(QUAKE2LIST
     tools/quake2/common/bspfile.c
     tools/quake2/common/bspfile.h
@@ -230,116 +234,3 @@ set(QUAKE2LIST
     tools/quake2/qdata_heretic2/tmix.c
     tools/quake2/qdata_heretic2/video.c
 )
-
-set(QUAKE3LIST
-    tools/quake3/common/aselib.c
-    tools/quake3/common/aselib.h
-    tools/quake3/common/bspfile.c
-    tools/quake3/common/bspfile.h
-    tools/quake3/common/cmdlib.c
-    tools/quake3/common/cmdlib.h
-    tools/quake3/common/inout.c
-    tools/quake3/common/jpeg.c
-    tools/quake3/common/l3dslib.c
-    tools/quake3/common/l3dslib.h
-    tools/quake3/common/md4.c
-    tools/quake3/common/md4.h
-    tools/quake3/common/mutex.c
-    tools/quake3/common/mutex.h
-    tools/quake3/common/polylib.c
-    tools/quake3/common/polylib.h
-    tools/quake3/common/polyset.h
-    tools/quake3/common/qfiles.h
-    tools/quake3/common/qthreads.h
-    tools/quake3/common/scriplib.c
-    tools/quake3/common/scriplib.h
-    tools/quake3/common/surfaceflags.h
-    tools/quake3/common/threads.c
-    tools/quake3/common/trilib.c
-    tools/quake3/common/trilib.h
-    tools/quake3/common/unzip.c
-    tools/quake3/common/unzip.h
-    tools/quake3/common/vfs.c
-    tools/quake3/common/vfs.h
-    tools/quake3/common/imagelib.c
-    tools/quake3/common/imagelib.h
-    tools/quake3/common/inout.h
-    tools/quake3/q3data/3dslib.c
-    tools/quake3/q3data/3dslib.h
-    tools/quake3/q3data/compress.c
-    tools/quake3/q3data/images.c
-    tools/quake3/q3data/md3lib.c
-    tools/quake3/q3data/md3lib.h
-    tools/quake3/q3data/models.c
-    tools/quake3/q3data/oldstuff.c
-    tools/quake3/q3data/p3dlib.c
-    tools/quake3/q3data/p3dlib.h
-    tools/quake3/q3data/polyset.c
-    tools/quake3/q3data/q3data.c
-    tools/quake3/q3data/q3data.h
-    tools/quake3/q3data/stripper.c
-    tools/quake3/q3data/video.c
-    tools/quake3/q3map2/brush.c
-    tools/quake3/q3map2/brush_primit.c
-    tools/quake3/q3map2/bsp.c
-    tools/quake3/q3map2/bspfile_abstract.c
-    tools/quake3/q3map2/bspfile_ibsp.c
-    tools/quake3/q3map2/bspfile_rbsp.c
-    tools/quake3/q3map2/convert_ase.c
-    tools/quake3/q3map2/convert_map.c
-    tools/quake3/q3map2/convert_obj.c
-    tools/quake3/q3map2/decals.c
-    tools/quake3/q3map2/facebsp.c
-    tools/quake3/q3map2/fog.c
-    tools/quake3/q3map2/game__null.h
-    tools/quake3/q3map2/game_darkplaces.h
-    tools/quake3/q3map2/game_dq.h
-    tools/quake3/q3map2/game_ef.h
-    tools/quake3/q3map2/game_etut.h
-    tools/quake3/q3map2/game_ja.h
-    tools/quake3/q3map2/game_jk2.h
-    tools/quake3/q3map2/game_nexuiz.h
-    tools/quake3/q3map2/game_prophecy.h
-    tools/quake3/q3map2/game_qfusion.h
-    tools/quake3/q3map2/game_quake3.h
-    tools/quake3/q3map2/game_quakelive.h
-    tools/quake3/q3map2/game_reaction.h
-    tools/quake3/q3map2/game_sof2.h
-    tools/quake3/q3map2/game_t.h
-    tools/quake3/q3map2/game_tenebrae.h
-    tools/quake3/q3map2/game_tremulous.h
-    tools/quake3/q3map2/game_wolf.h
-    tools/quake3/q3map2/game_wolfet.h
-    tools/quake3/q3map2/game_xonotic.h
-    tools/quake3/q3map2/leakfile.c
-    tools/quake3/q3map2/light.c
-    tools/quake3/q3map2/light_bounce.c
-    tools/quake3/q3map2/light_shadows.c
-    tools/quake3/q3map2/light_trace.c
-    tools/quake3/q3map2/light_ydnar.c
-    tools/quake3/q3map2/lightmaps.c
-    tools/quake3/q3map2/lightmaps_ydnar.c
-    tools/quake3/q3map2/map.c
-    tools/quake3/q3map2/mesh.c
-    tools/quake3/q3map2/model.c
-    tools/quake3/q3map2/patch.c
-    tools/quake3/q3map2/path_init.c
-    tools/quake3/q3map2/portals.c
-    tools/quake3/q3map2/prtfile.c
-    tools/quake3/q3map2/shaders.c
-    tools/quake3/q3map2/surface.c
-    tools/quake3/q3map2/surface_extra.c
-    tools/quake3/q3map2/surface_foliage.c
-    tools/quake3/q3map2/surface_fur.c
-    tools/quake3/q3map2/surface_meta.c
-    tools/quake3/q3map2/tjunction.c
-    tools/quake3/q3map2/tree.c
-    tools/quake3/q3map2/vis.c
-    tools/quake3/q3map2/visflow.c
-    tools/quake3/q3map2/writebsp.c
-    tools/quake3/q3map2/image.c
-    tools/quake3/q3map2/main.c
-    tools/quake3/q3map2/nav.cpp
-    tools/quake3/q3map2/navgen.h
-    tools/quake3/q3map2/q3map2.h
-)

diff --git a/tools/quake3/CMakeLists.txt b/tools/quake3/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8fca13d
--- /dev/null
+++ b/tools/quake3/CMakeLists.txt
@@ -0,0 +1,145 @@
+
+set(Q3MAP_VERSION 2.5.17n)
+add_definitions(-DQ3MAP_VERSION="${Q3MAP_VERSION}")
+
+include_directories(common)
+include_directories("${CMAKE_SOURCE_DIR}/libs")
+include_directories("${CMAKE_SOURCE_DIR}/include")
+
+add_executable(q3map2
+    common/cmdlib.c
+    common/cmdlib.h
+    common/imagelib.c
+    common/imagelib.h
+    common/inout.c
+    common/inout.h
+    common/jpeg.c
+    common/md4.c
+    common/md4.h
+    common/mutex.c
+    common/mutex.h
+    common/polylib.c
+    common/polylib.h
+    common/polyset.h
+    common/qfiles.h
+    common/qthreads.h
+    common/scriplib.c
+    common/scriplib.h
+    common/surfaceflags.h
+    common/threads.c
+    common/unzip.c
+    common/unzip.h
+    common/vfs.c
+    common/vfs.h
+    q3map2/brush.c
+    q3map2/brush_primit.c
+    q3map2/bsp.c
+    q3map2/bspfile_abstract.c
+    q3map2/bspfile_ibsp.c
+    q3map2/bspfile_rbsp.c
+    q3map2/convert_ase.c
+    q3map2/convert_map.c
+    q3map2/convert_obj.c
+    q3map2/decals.c
+    q3map2/facebsp.c
+    q3map2/fog.c
+#     q3map2/game__null.h
+#     q3map2/game_darkplaces.h
+#     q3map2/game_dq.h
+#     q3map2/game_ef.h
+#     q3map2/game_etut.h
+#     q3map2/game_ja.h
+#     q3map2/game_jk2.h
+#     q3map2/game_nexuiz.h
+#     q3map2/game_prophecy.h
+#     q3map2/game_qfusion.h
+#     q3map2/game_quake3.h
+#     q3map2/game_quakelive.h
+#     q3map2/game_reaction.h
+#     q3map2/game_sof2.h
+#     q3map2/game_t.h
+#     q3map2/game_tenebrae.h
+#     q3map2/game_tremulous.h
+#     q3map2/game_wolf.h
+#     q3map2/game_wolfet.h
+#     q3map2/game_xonotic.h
+    q3map2/image.c
+    q3map2/leakfile.c
+    q3map2/light.c
+    q3map2/light_bounce.c
+#     q3map2/light_shadows.c
+    q3map2/light_trace.c
+    q3map2/light_ydnar.c
+#     q3map2/lightmaps.c
+    q3map2/lightmaps_ydnar.c
+    q3map2/main.c
+    q3map2/map.c
+    q3map2/mesh.c
+    q3map2/model.c
+    q3map2/patch.c
+    q3map2/path_init.c
+    q3map2/portals.c
+    q3map2/prtfile.c
+    q3map2/q3map2.h
+    q3map2/shaders.c
+    q3map2/surface.c
+    q3map2/surface_extra.c
+    q3map2/surface_foliage.c
+    q3map2/surface_fur.c
+    q3map2/surface_meta.c
+    q3map2/tjunction.c
+    q3map2/tree.c
+    q3map2/vis.c
+    q3map2/visflow.c
+    q3map2/writebsp.c
+)
+find_package(GLIB REQUIRED)
+include_directories(${GLIB_INCLUDE_DIRS})
+
+find_package(JPEG REQUIRED)
+include_directories(${JPEG_INCLUDE_DIR})
+
+find_package(PNG REQUIRED)
+include_directories(${PNG_INCLUDE_DIR})
+
+find_package(LibXml2 REQUIRED)
+include_directories(${LIBXML2_INCLUDE_DIR})
+
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
+
+target_link_libraries(q3map2
+    ${GLIB_LIBRARIES}
+    ${JPEG_LIBRARIES}
+    ${PNG_LIBRARIES}
+    ${LIBXML2_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+    ddslib
+    etclib
+    filematch
+    l_net
+    mathlib
+    picomodel
+)
+
+if (UNIX)
+    target_link_libraries(q3map2 pthread m)
+endif()
+#$(if $(findstring $(OS),Win32),icons/q3map2.o,) ?
+
+
+#     q3data/3dslib.c
+#     q3data/3dslib.h
+#     q3data/compress.c
+#     q3data/images.c
+#     q3data/md3lib.c
+#     q3data/md3lib.h
+#     q3data/models.c
+#     q3data/oldstuff.c
+#     q3data/p3dlib.c
+#     q3data/p3dlib.h
+#     q3data/polyset.c
+#     q3data/q3data.c
+#     q3data/q3data.h
+#     q3data/stripper.c
+#     q3data/video.c

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 705f35170297457fa31d168b0f23845fcdb21084..5f1b3f8240786e9fa055a1be8d7e943876887341 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -35,6 +35,7 @@
 
 
 /* version */
+/** \todo Generate a header for Q3MAP_VERSION from cmake  */
 #ifndef Q3MAP_VERSION
 #error no Q3MAP_VERSION defined
 #endif