immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further cleanup USE_SDL_MAIN

dev-time-step
krzys-h 2015-09-29 22:39:08 +02:00
parent 49ee00d90d
commit 6e1504d7a5
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -94,8 +94,6 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
# Platform-dependent implementation of system.h # Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_macosx.cpp") set(SYSTEM_CPP_MODULE "system_macosx.cpp")
set(USE_SDL_MAIN 1) # fixes SDL_main
else() else()
message(STATUS "Build for other system") message(STATUS "Build for other system")
set(PLATFORM_WINDOWS 0) set(PLATFORM_WINDOWS 0)
@ -291,7 +289,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
message(STATUS "Adding MSVC-specific options") message(STATUS "Adding MSVC-specific options")
set(CBOT_STATIC 1) # only this works for some reason set(CBOT_STATIC 1) # only this works for some reason
set(USE_SDL_MAIN 1) # fixes SDL_main
set(WINGETOPT 1) # use wingetopt library set(WINGETOPT 1) # use wingetopt library
endif() endif()

1
cmake/msys.cmake
View File

@ -7,5 +7,4 @@ if (MSYS AND (NOT MXE))
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
set(COLOBOT_CXX_FLAGS "${COLOBOT_CXX_FLAGS} -U__STRICT_ANSI__") # fixes putenv() set(COLOBOT_CXX_FLAGS "${COLOBOT_CXX_FLAGS} -U__STRICT_ANSI__") # fixes putenv()
set(USE_SDL_MAIN 1) # fixes SDL_main
endif() endif()

2
src/app/main.cpp
View File

@ -89,7 +89,7 @@ The current layout is the following:
extern "C" extern "C"
{ {
int SDL_MAIN_FUNC(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
CLogger logger; // single instance of logger CLogger logger; // single instance of logger

2
src/common/config.h.cmake
View File

@ -16,8 +16,6 @@
#cmakedefine OPENAL_SOUND #cmakedefine OPENAL_SOUND
#define SDL_MAIN_FUNC main
#cmakedefine PORTABLE @PORTABLE@ #cmakedefine PORTABLE @PORTABLE@
#define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@" #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@"