Changeset 517

Timestamp:

04/05/08 06:58:08 (6 months ago)

Author:

krobillard

Message:

Thune-gl now builds on openSUSE Build Service.

Location:

trunk/thune

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake_modules/FindFreeType.cmake (modified) (3 diffs)
• cmake_modules/FindGLV.cmake (added)
• cmake_modules/FindThune.cmake (moved) (moved from trunk/thune/doc/FindThune.cmake)
• cmake_modules/FindThuneGL.cmake (moved) (moved from trunk/thune/doc/FindThuneGL.cmake) (1 diff)
• gl/CMakeLists.txt (modified) (6 diffs)
• gl/gx.c (modified) (3 diffs)
• gl/gx.h (modified) (2 diffs)
• gl/project.r (modified) (4 diffs)
• gl/test.t (modified) (2 diffs)
• thune-gl.spec (added)
• thune.spec (modified) (3 diffs)

trunk/thune/CMakeLists.txt

@@ -16 +16 @@
 
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
+
 if (UNIX)
         include_directories(. unix)
@@ -28 +30 @@
 
 
-add_library(thune-lib
+add_library(thune-lib SHARED
         urlan.c
         array.c
@@ -77 +79 @@
 
 
+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)
+
 # eof

trunk/thune/cmake_modules/FindFreeType.cmake

@@ -26 +26 @@
 # everything still works.
 FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-    $ENV{FREETYPE_DIR}
+#    $ENV{FREETYPE_DIR}
     /usr/local/include
     /usr/include
@@ -39 +39 @@
 
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-    $ENV{FREETYPE_DIR}/include/freetype2
+#    $ENV{FREETYPE_DIR}/include/freetype2
     /usr/local/include/freetype2
     /usr/include/freetype2
@@ -54 +54 @@
     NAMES freetype libfreetype freetype219
     PATHS
-    $ENV{FREETYPE_DIR}/lib
-    $ENV{FREETYPE_DIR}/lib
+#    $ENV{FREETYPE_DIR}/lib
+#    $ENV{FREETYPE_DIR}/lib
     /usr/local/lib
     /usr/lib

trunk/thune/cmake_modules/FindThuneGL.cmake

@@ -1 @@
-FIND_LIBRARY(THUNEGL_LIBRARY NAMES thuneGL PATH /usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib) 
+FIND_LIBRARY(THUNEGL_LIBRARY NAMES thune-gl PATH /usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib) 
 
 IF (THUNEGL_LIBRARY)

trunk/thune/gl/CMakeLists.txt

@@ -1 @@
-project( ThuneGL )
+project(ThuneGL C)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake_modules/")
@@ -7 +7 @@
 
 
-find_package( FreeType REQUIRED )
-find_package( OpenGL REQUIRED )
-find_package( OpenAL REQUIRED )
-find_package( PNG REQUIRED )
-#find_package( Thune REQUIRED )
+# 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 )
 
 
 if (APPLE)
-    include_directories(../unix glv/mac)
+    include_directories(../unix)
     add_definitions(-std=c99)
-    set(GLV_FILE glv/mac/glv.c)
+#    set(GLV_FILE glv/mac/glv.c)
 endif (APPLE)
 
 if (UNIX AND NOT APPLE)
         find_package( X11 REQUIRED )
-    include_directories(../unix glv/x11)
+    include_directories(../unix)
     include_directories(/usr/include/freetype2)
     add_definitions(-std=c99 -DUSE_XF86VMODE)
-    set(GLV_FILE glv/x11/glv.c)
+#    set(GLV_FILE glv/x11/glv.c)
     set(JOYSTICK_FILE joystick.c)
 endif (UNIX AND NOT APPLE)
 
 if (WIN32)
-    include_directories(../win32 glv/win32)
-    set(GLV_FILE glv/win32/glv.c)
+    include_directories(../win32)
+#    set(GLV_FILE glv/win32/glv.c)
 endif (WIN32)
 
@@ -49 +50 @@
 
 
-add_library(thuneGL-lib
+add_library(thuneGL-lib SHARED
     gx.c
     gx_dt.c
@@ -62 +63 @@
     rfont.c
     shader.c
+#    gui.c
     ${GLV_FILE}
     ${JOYSTICK_FILE}
 )
 
-set_target_properties(thuneGL-lib PROPERTIES OUTPUT_NAME "thuneGL")
+set_target_properties(thuneGL-lib PROPERTIES OUTPUT_NAME "thune-gl")
 
 link_directories(../)
 target_link_libraries(thuneGL-lib
-    thune
+    thune-lib
     ${PNG_LIBRARY}
     ${FREETYPE_LIBRARY}
+    ${GLV_LIBRARY}
     ${OPENGL_gl_LIBRARY}
     ${OPENGL_glu_LIBRARY}
@@ -79 +82 @@
 
 
-add_executable(thuneGL
+add_executable(thune-gl
     ../console.c
 )
 
-target_link_libraries(thuneGL thuneGL-lib)
+target_link_libraries(thune-gl thuneGL-lib)
 
 
@@ -104 +107 @@
 
 if (UNIX)
-install(TARGETS thuneGL     DESTINATION /usr/local/bin)
-install(TARGETS thuneGL-lib DESTINATION /usr/local/lib)
+install(TARGETS thune-gl     DESTINATION /usr/local/bin)
+install(TARGETS thuneGL-lib  DESTINATION /usr/local/lib)
 #install(FILES   urlan.h     DESTINATION /usr/local/include)
 endif (UNIX)

trunk/thune/gl/gx.c

@@ -25 +25 @@
 #include <stdio.h>
 #include <string.h>
-#include <glv_keys.h>
+#include <GL/glv_keys.h>
 #include "env.h"
 #include "glh.h"
@@ -1891 +1891 @@
     glGetIntegerv( GL_MAX_TEXTURE_UNITS, &gxEnv.maxTextureUnits );
 
+    //gui_init( &gxEnv.gui );
+
     return UR_EVAL_OK;
 }
@@ -1902 +1904 @@
 #endif
 
+    //gui_cleanup( &gxEnv.gui );
+
 #ifndef NO_AUDIO
     aud_shutdown();

trunk/thune/gl/gx.h

@@ -21 +21 @@
 
 
-#include <glv.h>
+#include <GL/glv.h>
 #include "urlan.h"
+//#include "gui.h"
 
 
@@ -147 +148 @@
 struct GXEnv
 {
+    //GUI gui;
     GLint maxTextureUnits;
 

trunk/thune/gl/project.r

@@ -10 +10 @@
 ]
 
-lib %thuneGL [
+lib %thune-gl0 [
     include_from %.
     include_from %..
@@ -20 +20 @@
         cflags {-DUSE_XF86VMODE}
         include_from %../unix
-        include_from %glv/x11
-        sources [
-            %glv/x11/glv.c
-            %joystick.c
-        ]
         include_from %/usr/include/freetype2
+        sources [%joystick.c]
     ]
     macx [
@@ -69 +65 @@
         %rfont.c
         %shader.c
+        ;%gui.c
         ;%noise.c
         ;%perlin.c
@@ -78 +75 @@
 ]
 
-exe %gx [
+exe %thune-gl [
     opengl
     cflags {-DLANG_THUNE -DTHUNE_GL}
-    libs_from %. %thuneGL
+    libs_from %. %thune-gl0
     linux [
         libs_from %/usr/X11R6/lib64 [%X11 %Xxf86vm]
         ;libs_from %/usr/X11R6/lib [%X11 %Xxf86vm]
-        libs [%freetype %bz2 %png]
+        libs [%freetype %bz2 %png %glv]
         libs [%openal %alut %vorbis %vorbisfile]
     ]

trunk/thune/gl/test.t

@@ -155 +155 @@
         dup :ortho-cam/viewport
 
-        dup :.t
-        .t/3 2 div  dup :center/x  :.t/3
-        .t/4 2 div  dup :center/y  :.t/4
-        .t :visual-cam/viewport
+        dup :tmp
+        tmp/3 2 div  dup :center/x  :tmp/3
+        tmp/4 2 div  dup :center/y  :tmp/4
+        tmp :visual-cam/viewport
     ]
 
@@ -310 +310 @@
 
 font! ["font/20thfont.ttf" 22] make :fontA
-font! ["font/FederationBold_KR.ttf" 12 256,128] make :fontF
+font! ["font/FederationBold-KR.ttf" 12 256,128] make :fontF
 
 0,0,155 display.swap

trunk/thune/thune.spec

@@ -10 +10 @@
 Source: thune-%{version}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?mandriva_version} 
+BuildRequires: cmake libbzip2_1-devel
+%else
 BuildRequires: cmake
+%endif
 
 %description
@@ -24 +28 @@
 
 %install
-# rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -s -m 755 thune $RPM_BUILD_ROOT/usr/bin
-# install -m 755 libthune.a $RPM_BUILD_ROOT/usr/lib
-# install -m 644 urlan.h $RPM_BUILD_ROOT/usr/include
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -s -m 755 thune $RPM_BUILD_ROOT%{_bindir}
+install -m 644 urlan.h $RPM_BUILD_ROOT%{_includedir}
+install -m 644 libthune.so $RPM_BUILD_ROOT%{_libdir}/libthune.so.0
+ln -s libthune.so.0 $RPM_BUILD_ROOT%{_libdir}/libthune.so
 
 %clean
@@ -35 +42 @@
 %files
 %defattr(-,root,root)
-/usr/bin/thune
-# /usr/lib/libthune.so
-# /usr/include/thune.h
+%{_bindir}/thune
+%{_libdir}/libthune.so
+%{_libdir}/libthune.so.0
+%{_includedir}/urlan.h
 
 %changelog