Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[361] branches/gui-bullet
|
From: <he...@us...> - 2013-06-12 11:44:21
|
Revision: 361
http://sourceforge.net/p/simspark/svn/361
Author: hedayat
Date: 2013-06-12 11:44:17 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
Fix compilation errors for rcssserver3d under GNU/Linux+GCC for the new GUI project
Modified Paths:
--------------
branches/gui-bullet/rcssserver3d/CMakeLists.txt
branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp
branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.h
branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.cpp
branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.h
branches/gui-bullet/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
branches/gui-bullet/rcssserver3d/sparkgui/CMakeLists.txt
branches/gui-bullet/rcssserver3d/sparkgui/main.cpp
branches/gui-bullet/spark/ChangeLog
branches/gui-bullet/spark/carbon/CMakeLists.txt
branches/gui-bullet/spark/carbon/signalplugin.cpp
branches/gui-bullet/spark/lib/salt/gmath.h
Modified: branches/gui-bullet/rcssserver3d/CMakeLists.txt
===================================================================
--- branches/gui-bullet/rcssserver3d/CMakeLists.txt 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/CMakeLists.txt 2013-06-12 11:44:17 UTC (rev 361)
@@ -46,7 +46,7 @@
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
- set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
+ set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} "--std=gnu++11" CACHE
STRING "Common C++ compiler flags" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -W -Wall -Woverloaded-virtual" CACHE
STRING "C++ compiler flags for Debug builds" FORCE)
Modified: branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp
===================================================================
--- branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.cpp 2013-06-12 11:44:17 UTC (rev 361)
@@ -36,17 +36,17 @@
#include <settings.h>
//SimSpark
-#include <oxygen\gamecontrolserver\gamecontrolserver.h>
-#include <zeitgeist\leaf.h>
+#include <oxygen/gamecontrolserver/gamecontrolserver.h>
+#include <zeitgeist/leaf.h>
//Soccer
-#include "soccer\gamestateaspect\gamestateaspect.h"
-#include "soccer\soccerruleaspect\soccerruleaspect.h"
-#include "soccer\ballstateaspect\ballstateaspect.h"
-//#include <agentstate\agentstate.h>
+#include "soccer/gamestateaspect/gamestateaspect.h"
+#include "soccer/soccerruleaspect/soccerruleaspect.h"
+#include "soccer/ballstateaspect/ballstateaspect.h"
+//#include <agentstate/agentstate.h>
//Boost
-#include <boost\make_shared.hpp>
+#include <boost/make_shared.hpp>
//Qt
#include <QValidator>
Modified: branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.h
===================================================================
--- branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.h 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe.h 2013-06-12 11:44:17 UTC (rev 361)
@@ -31,11 +31,11 @@
#include "isimcontrol.h"
#include "sparkcommandqueue.h"
-#include <boost\shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <QObject>
#include <QTimer>
-#include <soccer\soccertypes.h>
+#include <soccer/soccertypes.h>
class ServerThread;
class SimSpark;
Modified: branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.cpp
===================================================================
--- branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.cpp 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.cpp 2013-06-12 11:44:17 UTC (rev 361)
@@ -23,11 +23,11 @@
#include <sparkcommandqueue.h>
#include <simspark.h>
-#include <cutelogger\logger.h>
+#include <cutelogger/logger.h>
-#include <gamestateaspect\gamestateaspect.h>
-#include <ballstateaspect\ballstateaspect.h>
-#include <soccerruleaspect\soccerruleaspect.h>
+#include <gamestateaspect/gamestateaspect.h>
+#include <ballstateaspect/ballstateaspect.h>
+#include <soccerruleaspect/soccerruleaspect.h>
using namespace boost;
using namespace zeitgeist;
Modified: branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.h
===================================================================
--- branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.h 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/guiplugin/soccercontrolframe/soccercontrolframe_soccercommands.h 2013-06-12 11:44:17 UTC (rev 361)
@@ -26,13 +26,13 @@
* \brief Contains SoccerControlFrameUtil::SoccerCommand and derived command classes.
*/
-#include <boost\shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <isimcontrol.h>
-#include <cutelogger\logger.h>
+#include <cutelogger/logger.h>
#include <sparkcommands.h>
-#include <soccer\soccertypes.h>
+#include <soccer/soccertypes.h>
class SparkController;
class GameStateAspect;
Modified: branches/gui-bullet/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp
===================================================================
--- branches/gui-bullet/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/plugin/soccer/soccerruleaspect/soccerruleaspect.cpp 2013-06-12 11:44:17 UTC (rev 361)
@@ -812,7 +812,7 @@
if (time > mGameState->GetLastModeChange())
{
mLastKickOffKickTime = time;
- mCheckKickOffKickerFault = true;
+ mCheckKickOffKickerFoul = true;
mLastKickOffTaker = agent;
mGameState->SetPlayMode(PM_PlayOn);
}
Modified: branches/gui-bullet/rcssserver3d/sparkgui/CMakeLists.txt
===================================================================
--- branches/gui-bullet/rcssserver3d/sparkgui/CMakeLists.txt 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/sparkgui/CMakeLists.txt 2013-06-12 11:44:17 UTC (rev 361)
@@ -52,7 +52,7 @@
target_link_libraries(sparkgui optimized ${LIB})
ENDFOREACH(LIB)
-target_link_libraries(sparkgui )
+target_link_libraries(sparkgui ${Boost_LIBRARIES})
set_target_properties(sparkgui PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS sparkgui DESTINATION ${BINDIR})
Modified: branches/gui-bullet/rcssserver3d/sparkgui/main.cpp
===================================================================
--- branches/gui-bullet/rcssserver3d/sparkgui/main.cpp 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/rcssserver3d/sparkgui/main.cpp 2013-06-12 11:44:17 UTC (rev 361)
@@ -31,7 +31,7 @@
#include <QLibrary>
#include <QMainWindow>
-#include "sparkgui\sparkgui_config.h"
+#include "sparkgui/sparkgui_config.h"
void PrintGreeting()
{
Modified: branches/gui-bullet/spark/ChangeLog
===================================================================
--- branches/gui-bullet/spark/ChangeLog 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/spark/ChangeLog 2013-06-12 11:44:17 UTC (rev 361)
@@ -1,3 +1,17 @@
+2013-06-12 Hedayat Vatankhah <hed...@gm...>
+
+ * carbon/
+ * guiplugin/
+ * guilayout/
+ * data/guisetups/
+ * plugin/inputsysqt/
+ * plugin/openglsysqt/
+ - fixed compilation issues under GNU/Linux+GCC.
+
+ * lib/salt/gmath.h:
+ - removed type specifier for std::isnan, since not all overloads are
+ templates
+
2012-11-24 Hedayat Vatankhah <hed...@gm...>
* plugin/sceneeffector/sceneaction.h:
Modified: branches/gui-bullet/spark/carbon/CMakeLists.txt
===================================================================
--- branches/gui-bullet/spark/carbon/CMakeLists.txt 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/spark/carbon/CMakeLists.txt 2013-06-12 11:44:17 UTC (rev 361)
@@ -6,6 +6,7 @@
simulationprocess.h
simulationmanager.h
serverthread.h
+ signalplugin.h
simulationsetup.h
simulation.h
simulationthread.h
@@ -281,7 +282,7 @@
${OPENGL_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}) #intermediate directory
-add_library(carbon STATIC
+add_library(carbon
${carbon_SOURCES}
${carbon_QOBJECT_HEADERS_MOC}
${carbon_HEADERS}
@@ -289,7 +290,7 @@
${carbon_RESOURCES_RCC}
)
-target_link_libraries(carbon
+target_link_libraries(carbon
${FREETYPE_LIBRARIES}
${IL_LIBRARIES}
${OPENGL_LIBRARIES}
Modified: branches/gui-bullet/spark/carbon/signalplugin.cpp
===================================================================
--- branches/gui-bullet/spark/carbon/signalplugin.cpp 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/spark/carbon/signalplugin.cpp 2013-06-12 11:44:17 UTC (rev 361)
@@ -63,7 +63,7 @@
// Public
//--------------------------------------------------------------
-SignalPluginInstantiator::SignalPluginInstantiator(int id, const QString& name, const QString& caption, SignalPlugin* (*instantiateFunc)(void),
+SignalPluginInstantiator::SignalPluginInstantiator(int id, const QString& name, const QString& caption, SignalPlugin* (*instantiateFunc)(void),
int maxInstanceCount, const char* library) :
AbstractPluginInstantiator(id, name, caption, PT_SIGNAL, maxInstanceCount, library),
mInstantiateFunc(instantiateFunc)
Modified: branches/gui-bullet/spark/lib/salt/gmath.h
===================================================================
--- branches/gui-bullet/spark/lib/salt/gmath.h 2013-06-12 10:28:06 UTC (rev 360)
+++ branches/gui-bullet/spark/lib/salt/gmath.h 2013-06-12 11:44:17 UTC (rev 361)
@@ -214,7 +214,7 @@
#ifdef WIN32
return _isnan(static_cast<double>(f)) != 0;
#else
- return std::isnan<TYPE>(f);
+ return std::isnan(f);
#endif
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
