Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[317] trunk/spark
|
From: <he...@us...> - 2012-05-22 23:17:27
|
Revision: 317
http://simspark.svn.sourceforge.net/simspark/?rev=317&view=rev
Author: hedayat
Date: 2012-05-22 23:17:21 +0000 (Tue, 22 May 2012)
Log Message:
-----------
Improve compilation: don't link Kerosin against SDL and link corresponding plugins and test apps against SDL
Modified Paths:
--------------
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/plugin/accelerometer/accelerometer_c.cpp
trunk/spark/plugin/accelerometer/export.cpp
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/timersystemsdl/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/test/scenetest/main.cpp
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/ChangeLog 2012-05-22 23:17:21 UTC (rev 317)
@@ -1,3 +1,19 @@
+2012-05-23 Hedayat Vatankhah <hed...@gm...>
+
+ * lib/kerosin/CMakeLists.txt:
+ - latest cleanups for 0.2.3: don't link SDL to kerosin
+
+ * test/fonttest/CMakeLists.txt:
+ * test/inputtest/CMakeLists.txt:
+ * plugin/inputsdl/CMakeLists.txt:
+ * plugin/openglsyssdl/CMakeLists.txt:
+ * plugin/timersystemsdl/CMakeLists.txt:
+ - link against SDL
+
+ * test/scenetest/main.cpp:
+ * test/scenetest/CMakeLists.txt:
+ - scenetest doesn't need SDL
+
2012-05-19 Hedayat Vatankhah <hed...@gm...>
* lib/oxygen/physicsserver/int/angularmotorint.h:
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -118,12 +118,12 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
- ${IL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${IL_LIBRARIES}
- ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
+ ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
SOVERSION ${KEROSIN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/accelerometer/accelerometer_c.cpp
===================================================================
--- trunk/spark/plugin/accelerometer/accelerometer_c.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/accelerometer/accelerometer_c.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/spark/plugin/accelerometer/export.cpp
===================================================================
--- trunk/spark/plugin/accelerometer/export.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/accelerometer/export.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -2,7 +2,7 @@
this file is part of rcssserver3D
Copyright (C) 2008 RoboCup Soccer Server 3D Maintenance Group
- $Id:$
+ $Id$
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -23,7 +23,7 @@
add_library(inputsdl MODULE ${inputsdl_LIB_SRCS})
-target_link_libraries(inputsdl ${spark_libs})
+target_link_libraries(inputsdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -12,7 +12,7 @@
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
-target_link_libraries(openglsyssdl ${spark_libs})
+target_link_libraries(openglsyssdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/timersystemsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/timersystemsdl/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/plugin/timersystemsdl/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,7 +10,7 @@
include_directories(${SDL_INCLUDE_DIR})
add_library(timersystemsdl MODULE ${timersystemsdl_LIB_SRCS})
-target_link_libraries(timersystemsdl ${spark_libs})
+target_link_libraries(timersystemsdl ${spark_libs} ${SDL_LIBRARY})
if (NOT APPLE)
set_target_properties(timersystemsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,5 +10,5 @@
add_executable(fonttest ${fonttest_SRCS})
-target_link_libraries(fonttest salt zeitgeist oxygen kerosin)
+target_link_libraries(fonttest salt zeitgeist oxygen kerosin ${SDL_LIBRARY})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -10,7 +10,7 @@
add_executable(inputtest ${inputtest_SRCS})
-target_link_libraries(inputtest salt zeitgeist oxygen kerosin)
+target_link_libraries(inputtest salt zeitgeist oxygen kerosin ${SDL_LIBRARY})
########### install files ###############
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2012-05-22 23:17:21 UTC (rev 317)
@@ -8,8 +8,7 @@
md5mesh_c.cpp
)
-include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${IL_INCLUDE_DIR})
+include_directories(${FREETYPE_INCLUDE_DIRS} ${IL_INCLUDE_DIR})
if (NOT WIN32)
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/test/scenetest/main.cpp
===================================================================
--- trunk/spark/test/scenetest/main.cpp 2012-05-22 22:33:15 UTC (rev 316)
+++ trunk/spark/test/scenetest/main.cpp 2012-05-22 23:17:21 UTC (rev 317)
@@ -1,11 +1,6 @@
#include <zeitgeist/zeitgeist.h>
#include <kerosin/kerosin.h>
#include <oxygen/oxygen.h>
-#ifndef WIN32
-#include <SDL/SDL.h>
-#else
-#include <SDL.h>
-#endif
#include <zeitgeist/fileserver/fileserver.h>
using namespace boost;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
