mirrors-yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC synced 2024-11-25 14:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some more build snafus with VS2015

Browse source
This commit is contained in:
Pavel Krajcevski 2016-08-17 15:14:14 -07:00
parent c2ad7496a8
commit 964aa4ab8a
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BPTCEncoder/CMakeLists.txt
View file

@ -52,11 +52,11 @@ IF( NOT HAS_INLINE_ASSEMBLY AND NOT HAS_INLINE_ASSEMBLY_WITH_FLAGS )
ENDIF() ENDIF()
# Check to see whether or not our compiler supports atomic operations # Check to see whether or not our compiler supports atomic operations
IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR IF( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" ) ${CMAKE_C_COMPILER_ID} STREQUAL "Clang" )
SET( COMPILER_CLANG True ) SET( COMPILER_CLANG True )
ELSEIF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR ELSEIF( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR
"${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" ) ${CMAKE_C_COMPILER_ID} STREQUAL "GNU" )
SET( COMPILER_GNU True ) SET( COMPILER_GNU True )
ENDIF() ENDIF()

16
CMakeLists.txt
View file

@ -49,7 +49,7 @@
# #
# <http://gamma.cs.unc.edu/FasTC/> # <http://gamma.cs.unc.edu/FasTC/>
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
PROJECT(FasTC CXX C) PROJECT(FasTC CXX C)
SET(FasTC_MAJOR_VERSION 0) SET(FasTC_MAJOR_VERSION 0)
@ -63,15 +63,17 @@ IF(MSVC)
SET(MSVC_INSTALL_PATH "${PROJECT_SOURCE_DIR}/Windows") SET(MSVC_INSTALL_PATH "${PROJECT_SOURCE_DIR}/Windows")
SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${MSVC_INSTALL_PATH}") SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${MSVC_INSTALL_PATH}")
IF(MSVC10) IF(${MSVC_VERSION} EQUAL 1600)
SET(MSVC_VERSION_STRING vc100) SET(MSVC_VERSION_STRING vc100)
ELSEIF(MSVC11) ELSEIF(${MSVC_VERSION} EQUAL 1700)
SET(MSVC_VERSION_STRING vc110) SET(MSVC_VERSION_STRING vc110)
ELSEIF(MSVC12) ELSEIF(${MSVC_VERSION} EQUAL 1800)
SET(MSVC_VERSION_STRING vc120) SET(MSVC_VERSION_STRING vc120)
ELSEIF(MSVC90) ELSEIF(${MSVC_VERSION} EQUAL 1900)
SET(MSVC_VERSION_STRING vc140)
ELSEIF(${MSVC_VERSION} EQUAL 1500)
SET(MSVC_VERSION_STRING vc90) SET(MSVC_VERSION_STRING vc90)
ELSEIF(MSVC80) ELSEIF(${MSVC_VERSION} EQUAL 1400)
SET(MSVC_VERSION_STRING vc80) SET(MSVC_VERSION_STRING vc80)
ENDIF() ENDIF()
@ -108,6 +110,7 @@ ENDIF(TREAT_WARNINGS_AS_ERRORS)
SET(CMAKE_MODULE_PATH "${FasTC_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH}) SET(CMAKE_MODULE_PATH "${FasTC_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
FIND_PACKAGE(PVRTexLib) FIND_PACKAGE(PVRTexLib)
FIND_PACKAGE(BC7Export) FIND_PACKAGE(BC7Export)
FIND_PACKAGE(PNG)
###################################################################### ######################################################################
## ##
@ -173,7 +176,6 @@ INSTALL(
ENABLE_TESTING() ENABLE_TESTING()
IF(MSVC) IF(MSVC)
MESSAGE("Setting force shared crt")
SET(gtest_force_shared_crt TRUE CACHE BOOL "Used to properly select MSVC runtime libraries" FORCE) SET(gtest_force_shared_crt TRUE CACHE BOOL "Used to properly select MSVC runtime libraries" FORCE)
ENDIF(MSVC) ENDIF(MSVC)

1
IO/CMakeLists.txt
View file

@ -67,7 +67,6 @@ ELSE()
SET( LINK_FLAGS -lrt ${LINK_FLAGS} ) SET( LINK_FLAGS -lrt ${LINK_FLAGS} )
ENDIF() ENDIF()
FIND_PACKAGE( PNG )
IF( PNG_FOUND ) IF( PNG_FOUND )
INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )

2
Windows

@ -1 +1 @@
Subproject commit 6d9f6ba0f9ebec0f6735b1f29527ea5835ef3572 Subproject commit 90d9162aa39b5850457bcf01ae01ef916dda80b8