瀏覽代碼

Fix build

Ivan Savenko 1 年之前
父節點
當前提交
19ccef7131
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 0 2
      client/CMakeLists.txt
  2. 2 2
      lib/CThreadHelper.cpp

+ 0 - 2
client/CMakeLists.txt

@@ -375,7 +375,6 @@ else()
 	add_executable(vcmiclient ${client_SRCS} ${client_HEADERS})
 endif()
 
-add_dependencies(vcmiclient vcmiserver)
 if(NOT ENABLE_STATIC_LIBS)
 	add_dependencies(vcmiclient
 		BattleAI
@@ -454,7 +453,6 @@ elseif(APPLE_IOS)
 endif()
 
 target_link_libraries(vcmiclient PRIVATE vcmiservercommon)
-
 if(ENABLE_SINGLE_APP_BUILD AND ENABLE_LAUNCHER)
 	target_link_libraries(vcmiclient PRIVATE vcmilauncher)
 endif()

+ 2 - 2
lib/CThreadHelper.cpp

@@ -105,12 +105,12 @@ void setThreadName(const std::string &name)
 //not supported
 #endif
 
-#elif defined(VCMI_UNIX)
-	prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
 #elif defined(VCMI_APPLE)
 	pthread_setname_np(name.c_str());
 #elif defined(VCMI_HAIKU)
 	rename_thread(find_thread(NULL), name.c_str());
+#elif defined(VCMI_UNIX)
+	prctl(PR_SET_NAME, name.c_str(), 0, 0, 0);
 #endif
 }