Further cleanup USE_SDL_MAIN
parent
49ee00d90d
commit
6e1504d7a5
|
@ -94,8 +94,6 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
|||
|
||||
# Platform-dependent implementation of system.h
|
||||
set(SYSTEM_CPP_MODULE "system_macosx.cpp")
|
||||
|
||||
set(USE_SDL_MAIN 1) # fixes SDL_main
|
||||
else()
|
||||
message(STATUS "Build for other system")
|
||||
set(PLATFORM_WINDOWS 0)
|
||||
|
@ -291,7 +289,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
|||
message(STATUS "Adding MSVC-specific options")
|
||||
|
||||
set(CBOT_STATIC 1) # only this works for some reason
|
||||
set(USE_SDL_MAIN 1) # fixes SDL_main
|
||||
set(WINGETOPT 1) # use wingetopt library
|
||||
endif()
|
||||
|
||||
|
|
|
@ -7,5 +7,4 @@ if (MSYS AND (NOT MXE))
|
|||
set(PLATFORM_OTHER 0)
|
||||
|
||||
set(COLOBOT_CXX_FLAGS "${COLOBOT_CXX_FLAGS} -U__STRICT_ANSI__") # fixes putenv()
|
||||
set(USE_SDL_MAIN 1) # fixes SDL_main
|
||||
endif()
|
||||
|
|
|
@ -89,7 +89,7 @@ The current layout is the following:
|
|||
extern "C"
|
||||
{
|
||||
|
||||
int SDL_MAIN_FUNC(int argc, char *argv[])
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
CLogger logger; // single instance of logger
|
||||
|
||||
|
|
|
@ -16,8 +16,6 @@
|
|||
|
||||
#cmakedefine OPENAL_SOUND
|
||||
|
||||
#define SDL_MAIN_FUNC main
|
||||
|
||||
#cmakedefine PORTABLE @PORTABLE@
|
||||
|
||||
#define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@"
|
||||
|
|
Loading…
Reference in New Issue