Merge pull request #4809 from Orphis/cmake_windows
CMake for Windows: getting a working binary!
This commit is contained in:
@@ -199,6 +199,11 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
check_and_add_flag(EXCEPTIONS /EHsc)
|
||||
dolphin_compile_definitions(-D_DEBUG DEBUG_ONLY)
|
||||
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /NXCOMPAT")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /BASE:0x00400000")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /DYNAMICBASE:NO")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " /FIXED")
|
||||
|
||||
# Only MSBuild needs this, other generators will compile one file at a time
|
||||
if(CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||
add_compile_options("/MP")
|
||||
@@ -482,6 +487,9 @@ else()
|
||||
endif()
|
||||
|
||||
if(ENABLE_OPENAL)
|
||||
if(WIN32)
|
||||
set(ENV{OPENALDIR} ${CMAKE_CURRENT_LIST_DIR}/Externals/OpenAL)
|
||||
endif()
|
||||
find_package(OpenAL)
|
||||
if(OPENAL_FOUND)
|
||||
add_definitions(-DHAVE_OPENAL=1)
|
||||
|
||||
Reference in New Issue
Block a user