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

Move 'dependencies/msvc' inclusion to the CMakeLists.txt in top level.

This commit is contained in:
edorax 2017-02-11 13:39:50 +08:00
parent 4e096c127c
commit f7186a6493
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -277,6 +277,15 @@ IF(WIN32)
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
ENDIF() ENDIF()
IF(MSVC)
SET(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc")
IF(NOT EXISTS "${DEPS_MSVC}" AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
MESSAGE(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --recursive")
ENDIF()
INCLUDE_DIRECTORIES("${DEPS_MSVC}") # for GL/glext.h
ENDIF(MSVC)
# Compiler flags # Compiler flags
IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)

4
src/wx/CMakeLists.txt
View File

@ -149,10 +149,6 @@ ENDIF(WIN32 AND ENABLE_DIRECTX)
# contrib widgets # contrib widgets
include_directories(widgets) include_directories(widgets)
IF(MSVC)
include_directories(../../dependencies/msvc) # for GL/glext.h
ENDIF(MSVC)
# for out-of-tree builds, grab includes from both target and source dirs # for out-of-tree builds, grab includes from both target and source dirs
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})