piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #841 from AMDmi3/bundled-smfl-include-order

Browse Source 
Place bundled SFML include paths before others
This commit is contained in:
Ryan Houdek 2014-09-06 02:17:37 -05:00
commit 7a1eca149f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -592,7 +592,7 @@ if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION
else() else()
message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals") message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
add_subdirectory(Externals/SFML) add_subdirectory(Externals/SFML)
include_directories(Externals/SFML/include) include_directories(BEFORE Externals/SFML/include)
endif() endif()
if(USE_UPNP) if(USE_UPNP)

2
Externals/SFML/CMakeLists.txt vendored
View File

@ -1,4 +1,4 @@
include_directories(include) include_directories(BEFORE include)
set(SRCS src/SFML/Network/Ftp.cpp set(SRCS src/SFML/Network/Ftp.cpp
src/SFML/Network/Http.cpp src/SFML/Network/Http.cpp