Permalink
Browse files

Simplify convoluted platform conditions

  • Loading branch information...
TheCycoONE committed Jan 11, 2018
1 parent d624c7d commit 48cc5a900200f38e0ed5f294c5d39c45cfff1286
Showing with 8 additions and 47 deletions.
  1. +3 −23 AnimView/CMakeLists.txt
  2. +5 −24 CorsixTH/CMakeLists.txt
View
@@ -66,29 +66,9 @@ else()
message("Make sure the path is correctly defined or set the environment variable WXWIN to the correct location")
endif()
# Basic platform dependant stuff
if(UNIX)
if(APPLE)
# fruit goes here
else()
# regular unix/linux
endif()
else()
if(WIN32)
# Win32 specific
if(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
else()
if(MSYS)
# MSYS stuff
else()
# What's left? MINGW? CYGWIN? BORLAND?
endif()
endif()
else()
# other OS (not UNIX, not 32/64 bit Windows)
endif()
if(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
endif()
if(APPLE)
View
@@ -7,30 +7,11 @@ endif()
# Project Declaration
project(CorsixTH)
# Basic platform dependent stuff
if(UNIX)
if(APPLE)
# fruit goes here
add_subdirectory(SDLMain)
else()
# regular unix/linux
endif()
else()
if(WIN32)
# Win32 specific
if(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
else()
if(MSYS)
# MSYS stuff
else()
# What's left? MINGW? CYGWIN? BORLAND?
endif()
endif()
else()
# other OS (not UNIX, not 32/64 bit Windows)
endif()
if(APPLE)
add_subdirectory(SDLMain)
elseif(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
endif()
# Modify the config.h based upon our selection of options

0 comments on commit 48cc5a9

Please sign in to comment.