mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-03 11:31:46 +02:00
Merge pull request #1569 from rohit-n/fix-1545
Compile external WX with C++11 if Linux.
This commit is contained in:
commit
567e52b3de
2
Externals/wxWidgets3/CMakeLists.txt
vendored
2
Externals/wxWidgets3/CMakeLists.txt
vendored
@ -883,6 +883,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|||||||
${OPENGL_LIBRARY}
|
${OPENGL_LIBRARY}
|
||||||
${QUICKTIME_LIBRARY})
|
${QUICKTIME_LIBRARY})
|
||||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
|
||||||
add_definitions(-D__WXGTK__)
|
add_definitions(-D__WXGTK__)
|
||||||
set(SRCS
|
set(SRCS
|
||||||
${SRCS}
|
${SRCS}
|
||||||
@ -896,7 +897,6 @@ 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}
|
||||||
|
Loading…
Reference in New Issue
Block a user