Changeset 518

Timestamp:

04/06/08 06:15:01 (6 months ago)

Author:

krobillard

Message:

Thune-gl is now built separately with CMake.
Added UG_DT_COUNT & ug_datatypes to thune-gl header.

Location:

trunk/thune

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake_modules/FindThuneGL.cmake (modified) (1 diff)
• console.c (modified) (1 diff)
• gl/CMakeLists.txt (modified) (7 diffs)
• gl/gx.h (modified) (1 diff)
• gl/gx_dt.c (modified) (1 diff)
• gl/project.r (modified) (3 diffs)
• project.r (modified) (2 diffs)
• thune-gl.spec (modified) (2 diffs)

trunk/thune/CMakeLists.txt

@@ -16 +16 @@
 
 
+# Why isn't this the default?
+# Having to repeat the conditional expression is retarded.
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
 
@@ -22 +26 @@
         add_definitions(-std=c99 -pedantic -D_GNU_SOURCE)
     set(OS_FILE unix/os.c)
-endif (UNIX)
+endif ()
 
 if (WIN32)
         include_directories(. win32)
     set(OS_FILE win32/os.c)
-endif (WIN32)
+endif ()
 
 
@@ -54 +58 @@
 set_target_properties(thune-lib PROPERTIES OUTPUT_NAME "thune")
 
+if (APPLE)
+    target_link_libraries(thune-lib m bz2)
+endif ()
+if (UNIX AND NOT APPLE)
+    target_link_libraries(thune-lib m bz2 pthread)
+endif ()
+if (WIN32)
+    target_link_libraries(thune-lib ws2_32)
+endif ()
 
-add_executable(thune
-        console.c
-)
 
-if (APPLE)
-    target_link_libraries(thune thune-lib m bz2)
-endif (APPLE)
+add_executable(thune-bin console.c)
+set_target_properties(thune-bin PROPERTIES OUTPUT_NAME "thune")
 
-if (UNIX AND NOT APPLE)
-    target_link_libraries(thune thune-lib m bz2 pthread)
-endif (UNIX AND NOT APPLE)
+# NOTE: This links the binary with the libraries thune-lib links against.
+# This creates unneeded linker dependencies, but the CMake FAQ says that
+# there is no way to change this behavior.
+# Here is a blog entry which talks about this problem:
+#   http://blogs.sun.com/rie/entry/tt_dependencies_tt_define_what
 
-if (WIN32)
-    target_link_libraries(thune thune-lib ws2_32)
-endif (WIN32)
+target_link_libraries(thune-bin thune-lib)
 
 
 if (UNIX)
-install(TARGETS thune     DESTINATION /usr/local/bin)
+install(TARGETS thune-bin DESTINATION /usr/local/bin)
 install(TARGETS thune-lib DESTINATION /usr/local/lib)
 install(FILES   urlan.h   DESTINATION /usr/local/include)
-endif (UNIX)
-
-
-find_package( FreeType )
-find_package( OpenGL )
-find_package( OpenAL )
-find_package( PNG )
-find_package( GLV )
-
-# Holy shit CMake authors, having to repeat the conditional expression
-# is retarded!
-
-if (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
-        add_subdirectory( gl . )
-else (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
-        message(STATUS "Skipping Thune-GL. Missing these dependencies:")
-        if (NOT FREETYPE_FOUND)
-                message(STATUS "  FreeType not found")
-        endif (NOT FREETYPE_FOUND)
-        if (NOT OPENGL_FOUND)
-                message(STATUS "  OpenGL not found")
-        endif (NOT OPENGL_FOUND)
-        if (NOT OPENAL_FOUND)
-                message(STATUS "  OpenAL not found")
-        endif (NOT OPENAL_FOUND)
-        if (NOT PNG_FOUND)
-                message(STATUS "  PNG not found")
-        endif (NOT PNG_FOUND)
-        if (NOT GLV_FOUND)
-                message(STATUS "  GLV not found")
-        endif (NOT GLV_FOUND)
-endif (FREETYPE_FOUND AND OPENGL_FOUND AND OPENAL_FOUND AND PNG_FOUND AND GLV_FOUND)
+endif ()
 
 # eof

trunk/thune/cmake_modules/FindThuneGL.cmake

@@ +1 @@
+FIND_PATH(THUNEGL_INCLUDE_DIR thune-gl.h /usr/include /usr/local/include)
+
 FIND_LIBRARY(THUNEGL_LIBRARY NAMES thune-gl PATH /usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib) 
 
-IF (THUNEGL_LIBRARY)
+IF (THUNEGL_INCLUDE_DIR AND THUNEGL_LIBRARY)
    SET(THUNEGL_FOUND TRUE)
-ENDIF (THUNEGL_LIBRARY)
+ENDIF (THUNEGL_INCLUDE_DIR AND THUNEGL_LIBRARY)
 
 IF (THUNEGL_FOUND)
    IF (NOT ThuneGL_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Thune-GL: ${THUNE_LIBRARY}")
+      MESSAGE(STATUS "Found Thune-GL: ${THUNEGL_LIBRARY}")
    ENDIF (NOT ThuneGL_FIND_QUIETLY)
 ELSE (THUNEGL_FOUND)

trunk/thune/console.c

@@ -31 +31 @@
 #elif defined(THUNE_GL)
 
-extern int  gx_startup( UrlanEnv* );
-extern void gx_shutdown( UrlanEnv* );
-extern UDatatype ug_datatypes[];
+#include "gx.h"
 #define APPNAME     "Thune-GL"
 #define CUSTOM_DT           ug_datatypes
-#define CUSTOM_DT_COUNT     6
+#define CUSTOM_DT_COUNT     UG_DT_COUNT
 
 #else

trunk/thune/gl/CMakeLists.txt

@@ -1 +1 @@
 project(ThuneGL C)
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake_modules/")
 
 # set(CMAKE_BUILD_TYPE Debug)
@@ -7 +5 @@
 
 
-# These package checks are only needed when ../CMakeLists.txt is not used.
-#find_package( FreeType REQUIRED )
-#find_package( OpenGL REQUIRED )
-#find_package( OpenAL REQUIRED )
-#find_package( PNG REQUIRED )
-#find_package( GLV REQUIRED )
+# Why isn't this the default?
+# Having to repeat the conditional expression is retarded.
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake_modules/")
+
+
+find_package( Thune REQUIRED )
+find_package( FreeType REQUIRED )
+find_package( OpenGL REQUIRED )
+find_package( OpenAL REQUIRED )
+find_package( PNG REQUIRED )
+find_package( GLV REQUIRED )
 
 
@@ -19 +24 @@
     add_definitions(-std=c99)
 #    set(GLV_FILE glv/mac/glv.c)
-endif (APPLE)
+endif ()
 
 if (UNIX AND NOT APPLE)
@@ -28 +33 @@
 #    set(GLV_FILE glv/x11/glv.c)
     set(JOYSTICK_FILE joystick.c)
-endif (UNIX AND NOT APPLE)
+endif ()
 
 if (WIN32)
     include_directories(../win32)
 #    set(GLV_FILE glv/win32/glv.c)
-endif (WIN32)
+endif ()
 
 
@@ -70 +75 @@
 set_target_properties(thuneGL-lib PROPERTIES OUTPUT_NAME "thune-gl")
 
+if (APPLE)
+    target_link_libraries(thuneGL-lib bz2 m)
+endif ()
+
+if (UNIX AND NOT APPLE)
+    target_link_libraries(thuneGL-lib
+        vorbis vorbisfile alut
+        X11 Xxf86vm
+        bz2 m pthread
+    )
+endif ()
+
+if (WIN32)
+    target_link_libraries(thuneGL-lib ws2_32)
+endif ()
+
 link_directories(../)
 target_link_libraries(thuneGL-lib
-    thune-lib
+    ${THUNE_LIBRARY}
     ${PNG_LIBRARY}
     ${FREETYPE_LIBRARY}
@@ -82 +103 @@
 
 
-add_executable(thune-gl
-    ../console.c
-)
-
+add_executable(thune-gl ../console.c)
 target_link_libraries(thune-gl thuneGL-lib)
-
-
-if (APPLE)
-    target_link_libraries(thuneGL-lib bz2 m)
-endif (APPLE)
-
-if (UNIX AND NOT APPLE)
-    target_link_libraries(thuneGL-lib
-        vorbis vorbisfile alut
-        X11 Xxf86vm
-        bz2 m pthread
-    )
-endif (UNIX AND NOT APPLE)
-
-if (WIN32)
-    target_link_libraries(thuneGL-lib ws2_32)
-endif (WIN32)
 
 
@@ -110 +111 @@
 install(TARGETS thuneGL-lib  DESTINATION /usr/local/lib)
 #install(FILES   urlan.h     DESTINATION /usr/local/include)
-endif (UNIX)
+endif ()
 
 

trunk/thune/gl/gx.h

@@ -174 +174 @@
 };
 
+
+#define UG_DT_COUNT    6
+extern UDatatype ug_datatypes[ UG_DT_COUNT ];
 
 extern struct GrRenderState grState;

trunk/thune/gl/gx_dt.c

@@ -1135 +1135 @@
 
 
-UDatatype ug_datatypes[ 6 ] =
+UDatatype ug_datatypes[ UG_DT_COUNT ] =
 {
     {"draw-list!", 0, 0,

trunk/thune/gl/project.r

@@ -13 +13 @@
     include_from %.
     include_from %..
-    libs_from %.. %thune0
+   ;libs_from %.. %thune0
     cflags {-DLANG_THUNE}
     cflags {-DNO_AUDIO}
@@ -22 +22 @@
         include_from %/usr/include/freetype2
         sources [%joystick.c]
+
+        ;libs [%X11 %Xxf86vm]
+        ;libs [%freetype %bz2 %png %glv %GL %GLU
+        ;      %openal %alut %vorbis %vorbisfile]
     ]
     macx [
@@ -76 +80 @@
 
 exe %thune-gl [
-    opengl
     cflags {-DLANG_THUNE -DTHUNE_GL}
+    include_from %.
     libs_from %. %thune-gl0
+    libs_from %.. %thune0
     linux [
-        libs_from %/usr/X11R6/lib64 [%X11 %Xxf86vm]
         ;libs_from %/usr/X11R6/lib [%X11 %Xxf86vm]
+        libs [%X11 %Xxf86vm]
         libs [%freetype %bz2 %png %glv]
         libs [%openal %alut %vorbis %vorbisfile]

trunk/thune/project.r

@@ -82 +82 @@
     unix [
         sources [ %unix/os.c ]
+        ;libs {m bz2 pthread}
     ]
     win32 [
@@ -99 +100 @@
 
     macx  [
-        libs %m
-        libs %bz2
+        libs {m bz2}
     ]
     unix  [

trunk/thune/thune-gl.spec

@@ -11 +11 @@
 BuildRoot: %{_tmppath}/thune-%{version}-build
 %if 0%{?fedora_version}
-BuildRequires: cmake libglv mesa-libGL-devel mesa-libGLU-devel freetype-devel openal-devel freealut-devel libvorbis-devel libpng-devel libXxf86vm-devel
+BuildRequires: cmake libglv thune mesa-libGL-devel mesa-libGLU-devel freetype-devel openal-devel freealut-devel libvorbis-devel libpng-devel libXxf86vm-devel
 %endif
 %if 0%{?mandriva_version}
-BuildRequires: cmake libglv libmesagl1-devel libmesaglu1-devel freetype2-devel openal0-devel libfreealut0-devel libvorbis-devel libpng-devel libbzip2_1-devel
+BuildRequires: cmake libglv thune libmesagl1-devel libmesaglu1-devel freetype2-devel openal0-devel libfreealut0-devel libvorbis-devel libpng-devel libbzip2_1-devel
 %endif
 %if 0%{?suse_version}
-BuildRequires: cmake libglv Mesa-devel freetype2-devel openal-devel freealut-devel libvorbis-devel libpng-devel
+BuildRequires: cmake libglv thune Mesa-devel freetype2-devel openal-devel freealut-devel libvorbis-devel libpng-devel
 %endif
 
@@ -29 +29 @@
 
 %build
-cmake .
+cmake ./gl
 make