diff --git a/CMakeLists.txt b/CMakeLists.txt index fdb17010e1..83456a48a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,9 +218,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC") dolphin_compile_definitions(_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") else() add_definitions(-D_DEFAULT_SOURCE) check_and_add_flag(HAVE_WALL -Wall) @@ -252,15 +249,6 @@ else() dolphin_compile_definitions(_DEBUG DEBUG_ONLY) check_and_add_flag(GGDB -ggdb DEBUG_ONLY) - - if(NOT ANDROID AND _M_X86_64) - # PIE is required on Android, but not supported with the x86_64 jit currently - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fno-pie") - check_c_compiler_flag("-no-pie" NO_PIE_UPSTREAM) - if(NO_PIE_UPSTREAM) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") - endif() - endif() endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 8790aa27e0..e4dba0766c 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -46,9 +46,6 @@ - 0x00400000 - false - true $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) Windows diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index d5dc307c6b..b5ba473ab5 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -37,9 +37,6 @@ - 0x00400000 - false - true $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) /NODEFAULTLIB:libcmt %(AdditionalOptions) diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index 9c91baf8c0..1ca050a11d 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -40,10 +40,6 @@ $(ExternalsDir)gtest\include;$(ExternalsDir)gtest;%(AdditionalIncludeDirectories) - - 0x00400000 - false - true