summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-22 03:58:31 +0100
committerbunnei <bunneidev@gmail.com>2014-12-22 03:58:31 +0100
commitb9ef8b3fd2a252142c89bc2a8e1facc9e81d9968 (patch)
treee9cace6410521e09a5a9cd6785f421353d3031fc
parentMerge pull request #332 from lioncash/sel (diff)
parentCMake: Silence PNG not found error (diff)
downloadyuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar.gz
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar.bz2
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar.lz
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar.xz
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.tar.zst
yuzu-b9ef8b3fd2a252142c89bc2a8e1facc9e81d9968.zip
-rw-r--r--CMakeLists.txt25
1 files changed, 23 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 638b468a6..1491df6e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,34 @@ else()
add_definitions(/D_CRT_SECURE_NO_WARNINGS)
# set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+ # Tweak optimization settings
+ # As far as I can tell, there's no way to override the CMake defaults while leaving user
+ # changes intact, so we'll just clobber everything and say sorry.
+ message(STATUS "Cache compiler flags ignored, please edit CMakeFiles.txt to change the flags.")
+ # /MD - Multi-threaded runtime
+ # /Ox - Full optimization
+ # /Oi - Use intrinsic functions
+ # /Oy- - Don't omit frame pointer
+ # /GR- - Disable RTTI
+ # /GS- - No stack buffer overflow checks
+ # /EHsc - C++-only exception handling semantics
+ set(optimization_flags "/MD /Ox /Oi /Oy- /DNDEBUG /GR- /GS- /EHsc")
+ # /Zi - Output debugging information
+ # /Zo - enahnced debug info for optimized builds
+ set(CMAKE_C_FLAGS_RELEASE "${optimization_flags} /Zi" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "${optimization_flags} /Zi" CACHE STRING "" FORCE)
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${optimization_flags} /Zi /Zo" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${optimization_flags} /Zi /Zo" CACHE STRING "" FORCE)
endif()
add_definitions(-DSINGLETHREADED)
-find_package(PNG)
+find_package(PNG QUIET)
if (PNG_FOUND)
add_definitions(-DHAVE_PNG)
-endif ()
+else()
+ message(STATUS "libpng not found. Some debugging features have been disabled.")
+endif()
find_package(Boost)
if (Boost_FOUND)