Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[53] trunk
|
From: <he...@us...> - 2009-03-05 20:10:39
|
Revision: 53
http://simspark.svn.sourceforge.net/simspark/?rev=53&view=rev
Author: hedayat
Date: 2009-03-05 20:10:36 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Added new logos
Using the new icon in .desktop file
Some CMake cleanups
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/linux/rcssserver3d.desktop
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
trunk/spark/utility/rcssnet/socketstreambuf.hpp
Added Paths:
-----------
trunk/rcssserver3d/data/logos/
trunk/rcssserver3d/data/logos/simspark.png
trunk/rcssserver3d/data/logos/simsparklogo.png
trunk/rcssserver3d/data/logos/simsparklogo2.png
Removed Paths:
-------------
trunk/rcssserver3d/linux/rcssserver3d.png
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -17,6 +17,10 @@
find_package(SDL REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/ChangeLog 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,3 +1,14 @@
+2009-03-05 Hedayat Vatankhah <he...@gr...>
+
+ * linux/rcssserver3d.desktop:
+ - updated the icon name
+
+ * data/logos/simspark.png:
+ * data/logos/simsparklogo.png:
+ * data/logos/simsparklogo2.png:
+ - added simspark logos created by Joschka, and a 48x48 version of
+ simsparklogo.png which can be used as an icon
+
2009-02-09 Hedayat Vatankhah <he...@gr...>
* doc/users/user-manual.tex:
Added: trunk/rcssserver3d/data/logos/simspark.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simspark.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/rcssserver3d/data/logos/simsparklogo2.png
===================================================================
(Binary files differ)
Property changes on: trunk/rcssserver3d/data/logos/simsparklogo2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/rcssserver3d/linux/rcssserver3d.desktop
===================================================================
--- trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/linux/rcssserver3d.desktop 2009-03-05 20:10:36 UTC (rev 53)
@@ -3,8 +3,7 @@
Name=RoboCup Soccer Server 3D
Comment=RoboCup Soccer Simulation Server 3D
Exec=simspark
-Icon=rcssserver3d
+Icon=simspark
Terminal=false
Type=Application
Categories=Education;Science;Robotics;
-
Deleted: trunk/rcssserver3d/linux/rcssserver3d.png
===================================================================
(Binary files differ)
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -115,13 +115,9 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${OPENGL_gl_LIBRARY})
-else (APPLE)
- target_link_libraries(soccer)
-endif (APPLE)
+target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
@@ -131,4 +127,3 @@
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/soccer
FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
-
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,12 +25,8 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-if (APPLE)
- target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
-else (APPLE)
- target_link_libraries(soccermonitor)
-endif (APPLE)
+target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -18,14 +18,9 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-if (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${RCSSNET3D_LIBRARIES})
-else (APPLE)
- target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-endif (APPLE)
+target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -7,22 +7,16 @@
add_executable(simspark ${simspark_SRCS})
if (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
- ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
-else (APPLE)
- include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
- target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+ set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
+include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDL_LINK_LIBS})
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/rsgedit/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(wxWidgets REQUIRED gl base core adv)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,6 +9,10 @@
find_package(Boost REQUIRED)
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -25,8 +25,7 @@
check_include_file("CoreFoundation/CoreFoundation.h"
HAVE_COREFOUNDATION_COREFOUNDATION_H)
-if (USE_COREFOUNDATION STREQUAL "OFF")
-else (USE_COREFOUNDATION STREQUAL "OFF")
+if (NOT USE_COREFOUNDATION STREQUAL "OFF")
if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION ON)
message("USE_COREFOUNDATION ON")
@@ -34,7 +33,7 @@
set(USE_COREFOUNDATION OFF)
message("USE_COREFOUNDATION OFF")
endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
-endif (USE_COREFOUNDATION STREQUAL "OFF")
+endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
@@ -89,6 +88,10 @@
########## add extra flags ##########
+if(NOT CMAKE_BUILD_TYPE)
+ set (CMAKE_BUILD_TYPE Release)
+endif(NOT CMAKE_BUILD_TYPE)
+
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
@@ -110,7 +113,8 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/windows/include)
endif(WIN32)
########## library version numbers ##########
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
+ ${ODE_INCLUDE_DIR})
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -116,11 +116,7 @@
renderserver/customrender_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -221,7 +221,8 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES}
+ ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -11,9 +11,9 @@
if (Boost_REGEX_FOUND)
add_library(filesystemzip MODULE ${filesystemzip_LIB_SRCS})
- if(WIN32)
- include_directories(${ZLIB_INCLUDE_DIR})
- endif(WIN32)
+ if(WIN32)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ endif(WIN32)
target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,10 +8,6 @@
imageperceptor_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
target_link_libraries(imageperceptor ${spark_libs})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,9 +8,7 @@
openglsystemsdl_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include ${SDL_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR})
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -9,10 +9,6 @@
rosimporter_c.cpp
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/windows/include)
-endif(WIN32)
-
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,19 +5,12 @@
spark.h
)
-if(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
-endif(WIN32)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
add_library(spark SHARED ${spark_LIB_SRCS})
-if (APPLE)
- target_link_libraries(spark salt zeitgeist oxygen kerosin)
-else (APPLE)
- target_link_libraries(spark)
-endif (APPLE)
+target_link_libraries(spark salt zeitgeist oxygen kerosin)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(fonttest ${fonttest_SRCS})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -5,11 +5,8 @@
main.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(inputtest ${inputtest_SRCS})
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2009-03-05 20:10:36 UTC (rev 53)
@@ -8,11 +8,8 @@
md5mesh_c.cpp
)
-if(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
-else(WIN32)
- include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
-endif(WIN32)
+include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_executable(scenetest ${scenetest_SRCS})
Modified: trunk/spark/utility/rcssnet/socketstreambuf.hpp
===================================================================
--- trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 13:42:41 UTC (rev 52)
+++ trunk/spark/utility/rcssnet/socketstreambuf.hpp 2009-03-05 20:10:36 UTC (rev 53)
@@ -4,7 +4,7 @@
socketstreambuf.hpp - A socket stream buffer
-------------------
begin : 08-JAN-2003
- copyright : (C) 2003 by The RoboCup Soccer Server
+ copyright : (C) 2003 by The RoboCup Soccer Server
Maintenance Group.
email : sse...@li...
***************************************************************************/
@@ -25,6 +25,7 @@
//g++ 2.95.6 doesn't have the streambuf header, so iostream is used instead
//#include <streambuf>
#include<iostream>
+#include <cstdio>
#include "socket.hpp"
@@ -43,7 +44,7 @@
public:
SocketStreamBuf( Socket& socket,
const Addr& dest,
- ConnType conn = CONN_ON_READ,
+ ConnType conn = CONN_ON_READ,
std::streamsize bufsize = 8192 )
: m_socket( socket ),
m_end_point( dest ),
@@ -54,7 +55,7 @@
m_connect( conn )
{}
-
+
SocketStreamBuf( Socket& socket,
ConnType conn = NO_CONN,
std::streamsize bufsize = 8192 )
@@ -73,16 +74,16 @@
delete [] m_inbuf;
delete [] m_outbuf;
}
-
+
void
setEndPoint( const Addr& addr )
{ m_end_point = addr; }
-
+
void
setConnectType( ConnType conn )
{ m_connect = conn; }
-
+
protected:
virtual
bool
@@ -97,14 +98,14 @@
else
return m_socket.send( m_outbuf, size, m_end_point ) > 0;
}
-
+
virtual
int_type
overflow( int_type c = EOF )
{
// this method is supposed to flush the put area of the buffer
// to the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( pptr() == NULL )
@@ -123,9 +124,9 @@
sputc( c );
return 0;
}
-
+
virtual
- int
+ int
sync()
{
if( pptr() != NULL )
@@ -139,25 +140,25 @@
}
return 0;
}
-
+
virtual
int_type
underflow()
{
// this method is supposed to read some bytes from the I/O device
-
+
// if the buffer was not already allocated nor set by user,
// do it just now
if( gptr() == NULL )
{
m_inbuf = new char_type[m_bufsize];
}
-
+
if( m_remained != 0 )
m_inbuf[0] = m_remained_char;
-
- int readn = m_bufsize * sizeof( char_type ) - m_remained;
+
+ int readn = m_bufsize * sizeof( char_type ) - m_remained;
if( m_socket.isConnected() )
readn = m_socket.recv( m_inbuf + m_remained,
readn );
@@ -170,7 +171,7 @@
if( m_connect == CONN_ON_READ && readn > 0 )
m_socket.connect( addr );
}
-
+
if( readn < 0 || ( readn == 1 && (m_inbuf + m_remained)[ 0 ] == -1 ) )
{
(m_inbuf + m_remained)[ 0 ] = -1;
@@ -179,23 +180,23 @@
int totalbytes = readn + m_remained;
setg( m_inbuf, m_inbuf,
m_inbuf + totalbytes / sizeof(char_type) );
-
+
m_remained = totalbytes % sizeof( char_type );
if( m_remained != 0 )
m_remained_char = m_inbuf[totalbytes / sizeof(char_type)];
-
+
return sgetc();
}
-
+
private:
-
+
// not used
SocketStreamBuf( const SocketStreamBuf& );
-
+
// not used
- SocketStreamBuf&
+ SocketStreamBuf&
operator=( const SocketStreamBuf& );
-
+
Socket& m_socket;
Addr m_end_point;
std::streamsize m_bufsize;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
