ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1545 from rohit-n/wx-c++11 

Explicitly compile external WX in C++11 mode.
This commit is contained in:
Lioncash 2014-11-17 13:59:05 -05:00
parent b1c06fdd19 12b7600ae7
commit 7353990bcc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Externals/wxWidgets3/CMakeLists.txt vendored
View File

@ -862,6 +862,7 @@ set(SRCS
${SRCS_GENERIC}) ${SRCS_GENERIC})
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
add_definitions(-D__WXOSX_COCOA__) add_definitions(-D__WXOSX_COCOA__)
set(SRCS set(SRCS
${SRCS} ${SRCS}
@ -895,6 +896,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
${PANGOCAIRO_LIBRARIES} ${PANGOCAIRO_LIBRARIES}
${GTK2_LIBRARIES}) ${GTK2_LIBRARIES})
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
add_definitions(-D__WXMSW__) add_definitions(-D__WXMSW__)
set(SRCS set(SRCS
${SRCS} ${SRCS}
@ -904,7 +906,6 @@ endif()
add_definitions(-DWXBUILDING) add_definitions(-DWXBUILDING)
# wxWidgets warnings are not our problem. # wxWidgets warnings are not our problem.
add_definitions(-w) add_definitions(-w)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
enable_precompiled_headers(include/wx/wxprec.h src/common/dummy.cpp SRCS) enable_precompiled_headers(include/wx/wxprec.h src/common/dummy.cpp SRCS)
add_library(wx STATIC ${PNG_SRCS} ${SRCS}) add_library(wx STATIC ${PNG_SRCS} ${SRCS})