Created
May 23, 2017 17:49
-
-
Save hcorion/8972ab0d93c2f6aff48c56b4b61c882b to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt | |
index a2c2de58..a634d9e2 100644 | |
--- a/rpcs3/CMakeLists.txt | |
+++ b/rpcs3/CMakeLists.txt | |
@@ -2,10 +2,18 @@ cmake_minimum_required(VERSION 2.8.12) | |
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules") | |
set(RES_FILES "") | |
-include(cotire) | |
+find_package(Qt5 REQUIRED COMPONENTS Widgets) | |
+set(RPCS3_QT_LIBS Qt5::Widgets) | |
-project(rpcs3) | |
+set(CMAKE_AUTOMOC ON) | |
+ if (Qt5_POSITION_INDEPENDENT_CODE) | |
+ SET(CMAKE_POSITION_INDEPENDENT_CODE ON) | |
+ endif() | |
+ add_definitions(-fPIC) | |
+include_directories(${Qt5Widgets_INCLUDE_DIRS}) | |
+#include(cotire) | |
+project(rpcs3) | |
# Generate git-version.h at build time. | |
add_custom_target(GitVersion ALL | |
DEPENDS something_that_never_exists) | |
@@ -17,6 +25,7 @@ add_custom_command(OUTPUT something_that_never_exists | |
include(ConfigureCompiler) | |
+ | |
if(WIN32) | |
add_definitions(-DUNICODE) | |
add_definitions(-D_WIN32_WINNT=0x0601) | |
@@ -176,6 +185,7 @@ link_directories( | |
"${RPCS3_SRC_DIR}/../Vulkan" | |
) | |
+ | |
if(NOT USE_SYSTEM_FFMPEG) | |
if(MSVC OR NOT WIN32) | |
link_directories("${RPCS3_SRC_DIR}/../3rdparty/ffmpeg/${PLATFORM_ARCH}/lib") | |
@@ -199,11 +209,16 @@ RPCS3_SRC | |
if(NOT WIN32) | |
set (EXCLUDE_DIR "/RSX/VK/") | |
+ set (EXCLUDE_GUI_DIR "/Gui/") | |
foreach (TMP_PATH ${RPCS3_SRC}) | |
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) | |
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) | |
list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) | |
endif () | |
+ string (FIND ${TMP_PATH} ${EXCLUDE_GUI_DIR} EXCLUDE_GUI_DIR_FOUND) | |
+ if (NOT ${EXCLUDE_GUI_DIR_FOUND} EQUAL -1) | |
+ list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) | |
+ endif () | |
endforeach(TMP_PATH) | |
endif() | |
@@ -244,4 +259,5 @@ endif() | |
target_link_libraries(rpcs3 rsx_decompiler shader_code) | |
set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h") | |
-cotire(rpcs3) | |
+#cotire(rpcs3) | |
+target_link_libraries(rpcs3 ${RPCS3_QT_LIBS}) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment