Fixes to support building with GCC
This commit is contained in:
parent
b4f6c4cb48
commit
ca28e21739
|
@ -1,6 +1,11 @@
|
|||
cmake_minimum_required(VERSION 3.12)
|
||||
set(MACOSX_DEPLOYMENT_TARGET 10.10)
|
||||
|
||||
# Use release build type as default (assimp complains if this is unset)
|
||||
if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE Release)
|
||||
endif()
|
||||
|
||||
project(PrimeWorldEditor CXX)
|
||||
|
||||
include(./dew.cmake)
|
||||
|
@ -10,7 +15,11 @@ include(cmake/generate_product_version.cmake)
|
|||
|
||||
if(MSVC)
|
||||
add_compile_options(/WX /wd4267 /wd4100 /wd4101 /wd4189)
|
||||
elseif(APPLE)
|
||||
else()
|
||||
add_compile_options(-Wno-multichar)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
add_compile_definitions(GL_SILENCE_DEPRECATION)
|
||||
endif()
|
||||
|
||||
|
|
|
@ -73,12 +73,12 @@ public:
|
|||
InternalWaitForResults(Future);
|
||||
return Future.result();
|
||||
}
|
||||
|
||||
template<>
|
||||
void WaitForResults(QFuture<void> Future)
|
||||
{
|
||||
InternalWaitForResults(Future);
|
||||
}
|
||||
};
|
||||
|
||||
template<>
|
||||
inline void CProgressDialog::WaitForResults(QFuture<void> Future)
|
||||
{
|
||||
InternalWaitForResults(Future);
|
||||
}
|
||||
|
||||
#endif // CPROGRESSDIALOG_H
|
||||
|
|
Loading…
Reference in New Issue