cleanup

Author: abma

CMakeLists.txt

@@ -1,20 +1,7 @@
 project(SpringMapConvNG)
-cmake_minimum_required(VERSION 3.0)
-
-macro(use_cxx11)
-  if (CMAKE_VERSION VERSION_LESS "3.1")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-    endif ()
-  else ()
-    set (CMAKE_CXX_STANDARD 11)
-  endif ()
-endmacro(use_cxx11)
-
-use_cxx11()
-
-LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+cmake_minimum_required(VERSION 3.1)
 
+set (CMAKE_CXX_STANDARD 11)
 find_package(DevIL REQUIRED)
 
 
@@ -30,7 +17,9 @@ set(MAPCONV_FILES
 add_executable(springMapConvNG src/main.cpp ${MAPCONV_FILES})
 add_executable(smfdecompiler src/decompiler.cpp ${MAPCONV_FILES})
 
-if(FALSE) # change to TRUE when compiling with statix mxe
+option(MAPCONV_STATIC "link static" FALSE)
+
+if(MAPCONV_STATIC)
 	add_definitions(-DIL_STATIC_LIB)
 	set(LINKLIBS png tiff lzma Half IlmImf IlmThread Iex jasper jpeg z)
 	set_target_properties(springMapConvNG PROPERTIES LINK_FLAGS "-static" )