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

clean up dependencies/msvc inclusion cmake code 

Move the check for dependencies/msvc into the previous IF(WIN32) block
adding an IF(MSVC) level.

Remove duplicate call to INCLUDE_DIRECTORIES(dependencies/msvc) from
later on in the main CMakeLists.txt.
This commit is contained in:
Rafael Kitover 2017-02-11 06:33:08 -08:00
parent d6c1b53653
commit c02c448f47
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -275,16 +275,12 @@ IF(WIN32)
ENDIF() ENDIF()
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include") INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
ENDIF()
IF(MSVC) IF(MSVC)
SET(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc") SET(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc")
IF(NOT EXISTS "${DEPS_MSVC}" AND EXISTS "${CMAKE_SOURCE_DIR}/.git") INCLUDE_DIRECTORIES("${DEPS_MSVC}") # for GL/glext.h and getopt.h
MESSAGE(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --recursive") ENDIF()
ENDIF() ENDIF()
INCLUDE_DIRECTORIES("${DEPS_MSVC}") # for GL/glext.h
ENDIF(MSVC)
# Compiler flags # Compiler flags
@ -635,12 +631,6 @@ IF( ENABLE_FFMPEG )
) )
ENDIF( ENABLE_FFMPEG ) ENDIF( ENABLE_FFMPEG )
if(MSVC)
INCLUDE_DIRECTORIES(
dependencies/msvc # for getopt.h
)
endif()
ADD_LIBRARY ( ADD_LIBRARY (
vbamcore vbamcore
STATIC STATIC