mirror of
https://github.com/edubart/otclient.git
synced 2026-01-02 04:27:11 +01:00
some cleanup in modules, fixes in tooltip, uiwidget warnings, disable map saving for a while
This commit is contained in:
@@ -8,9 +8,8 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake;${CMAKE_MODULE_PATH}")
|
||||
|
||||
# framework options
|
||||
OPTION(NO_CONSOLE "Disables console window on Windows platform" OFF)
|
||||
OPTION(HANDLE_EXCEPTIONS "Generate crash reports" OFF)
|
||||
OPTION(CRASH_HANDLER "Generate crash reports" OFF)
|
||||
OPTION(USE_OPENGL_ES2 "Use OpenGL ES 2.0 (for mobiles devices)" OFF)
|
||||
OPTION(USE_GCC47 "Use experimental gcc 4.7" OFF)
|
||||
|
||||
# set debug as default build type
|
||||
IF(NOT CMAKE_BUILD_TYPE)
|
||||
@@ -46,27 +45,22 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
|
||||
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
ADD_DEFINITIONS(-D_DEBUG)
|
||||
ADD_DEFINITIONS(-DDEBUG)
|
||||
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
|
||||
MESSAGE(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
|
||||
IF(USE_OPENGL_ES2)
|
||||
MESSAGE(STATUS "Renderer: OpenGL ES 2")
|
||||
MESSAGE(STATUS "Renderer: OpenGL ES 2.0")
|
||||
ELSE(USE_OPENGL_ES2)
|
||||
MESSAGE(STATUS "Renderer: OpenGL")
|
||||
ENDIF(USE_OPENGL_ES2)
|
||||
|
||||
IF(HANDLE_EXCEPTIONS)
|
||||
ADD_DEFINITIONS(-DHANDLE_EXCEPTIONS)
|
||||
MESSAGE(STATUS "Generate crash reports: ON")
|
||||
ELSE(HANDLE_EXCEPTIONS)
|
||||
MESSAGE(STATUS "Generate crash reports: OFF")
|
||||
ENDIF(HANDLE_EXCEPTIONS)
|
||||
|
||||
IF(USE_GCC47)
|
||||
SET(CMAKE_C_COMPILER gcc-4.7)
|
||||
SET(CMAKE_CXX_COMPILER g++-4.7)
|
||||
ENDIF(USE_GCC47)
|
||||
IF(CRASH_HANDLER)
|
||||
ADD_DEFINITIONS(-DCRASH_HANDLER)
|
||||
MESSAGE(STATUS "Crash handler: ON")
|
||||
ELSE(CRASH_HANDLER)
|
||||
MESSAGE(STATUS "Crash handler: OFF")
|
||||
ENDIF(CRASH_HANDLER)
|
||||
|
||||
IF(WIN32)
|
||||
SET(framework_SOURCES ${framework_SOURCES}
|
||||
@@ -88,9 +82,6 @@ IF(WIN32)
|
||||
ELSE(WIN32)
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
||||
SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -rdynamic")
|
||||
IF(USE_GCC47)
|
||||
ADD_DEFINITIONS(-D_GLIBCXX__PTHREADS)
|
||||
ENDIF(USE_GCC47)
|
||||
SET(ADDITIONAL_LIBRARIES X11 dl)
|
||||
SET(framework_SOURCES ${framework_SOURCES}
|
||||
${CMAKE_CURRENT_LIST_DIR}/platform/x11window.cpp
|
||||
|
||||
Reference in New Issue
Block a user