Harmonize main() signature, drop unused definition

Solves #138.
asrob-uc3m · Oct 6, 2018 · edf35f4 · edf35f4
1 parent 45d01fa
commit edf35f4
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 16 deletions.
diff --git a/src/programs/rdServer/CMakeLists.txt b/src/programs/rdServer/CMakeLists.txt
@@ -16,10 +16,6 @@ target_link_libraries(rdServer YARP::YARP_init
                                ServerLib
                                ROBOTICSLAB::ColorDebug)
 
-if(WIN32)
-    target_compile_definitions(rdServer PUBLIC SDL_MAIN_HANDLED)
-endif()
-
 install(TARGETS rdServer DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # Organize targets in folders (Visual Studio)

diff --git a/src/programs/robotDevastation/CMakeLists.txt b/src/programs/robotDevastation/CMakeLists.txt
@@ -25,10 +25,6 @@ target_link_libraries(robotDevastation YARP::YARP_OS
                                        ASROB::RobotInterfaces
                                        ROBOTICSLAB::ColorDebug)
 
-if(WIN32)
-    target_compile_definitions(robotDevastation PUBLIC SDL_MAIN_HANDLED)
-endif()
-
 install(TARGETS robotDevastation DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # Organize targets in folders (Visual Studio)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -16,10 +16,6 @@ add_subdirectory(${GTestSources_SOURCE_DIR} ${CMAKE_BINARY_DIR}/gtest)
 
 include_directories(${GTestSources_INCLUDE_DIR})
 
-if(WIN32)
-    add_definitions(-DSDL_MAIN_HANDLED)
-endif()
-
 # UI related
 add_executable(testSDLTextDisplay testSDLTextDisplay.cpp)
 target_link_libraries(testSDLTextDisplay YARP::YARP_OS ${SDL2_LIBRARY} ${SDL2_TTF_LIBRARIES})

diff --git a/tests/testInputManager.cpp b/tests/testInputManager.cpp
@@ -187,7 +187,7 @@ class TestEventListener : public InputEventListener
 
 }  // namespace rd
 
-int main(void)
+int main(int argc, char *argv[])
 {
     using namespace rd;
     using namespace rd::test;

diff --git a/tests/testMockScreen.cpp b/tests/testMockScreen.cpp
@@ -18,7 +18,7 @@
 
 using namespace rd;
 
-int main()
+int main(int argc, char *argv[])
 {
     //-- Initialization
     initSDL();

diff --git a/tests/testSDLScreenManager.cpp b/tests/testSDLScreenManager.cpp
@@ -20,7 +20,7 @@
 
 using namespace rd;
 
-int main()
+int main(int argc, char *argv[])
 {
     //-- Start SDL, Create SDLScreen Manager
     SDLScreenManager::RegisterManager();

diff --git a/tests/testSDLTextDisplay.cpp b/tests/testSDLTextDisplay.cpp
@@ -17,7 +17,7 @@
 
 
 
-int main(void)
+int main(int argc, char *argv[])
 {
     //-- Configure Resourcefinder to ind the real path to the resources
     yarp::os::ResourceFinder rf;