mirror of
https://github.com/reactos/reactos.git
synced 2025-07-24 13:53:41 +00:00
[0.4.14][SDK][FREETYPE] Fix GCC8.4 -O2 build CORE-17820
RosBE2.2.1 Win GCC8.4.0 RELEASE bootcd build was failing.
This was the last build error for the configuration:
-DENABLE_ROSTESTS=1 -DCMAKE_BUILD_TYPE=Release
fix picked from 0.4.15-dev-285-g 5349f49cfe
Sidenote of current compiler support on releases/0.4.14 (tested on 0.4.14-RC-110-g8600a00):
RosBE2.1.2 Lin GCC4.7.2 Debug build worked before and after this commit (bootcd+livecd) <- primary toolchain for releases/0.4.14
RosBE2.1.6 Win GCC4.7.2 Debug build worked before and after this commit (bootcd+livecd)
RosBE2.1.6 Win GCC4.7.2 Release build worked before and after this commit (bootcd+livecd)
RosBE2.2.1 Win GCC8.4.0 Debug build worked before and after this commit (bootcd+livecd)
RosBE2.1.6 Win MSVC2010SP1 Debug build worked before and after this commit (bootcd+livecd)
RosBE2.1.6 Win MSVC2010SP1 Release build worked before and after this commit (bootcd+livecd)
VSSolution msbuild 2010SP1 Debug build should also work, last time tested 0.4.14-RC-68-g366c46b
Newer MSVC (<= MSVC19.28.29115) might/should work as well, but I did not explicitly test those myself.
This commit is contained in:
parent
8600a00fe4
commit
6ef3e43fc0
1 changed files with 3 additions and 1 deletions
4
sdk/lib/3rdparty/freetype/CMakeLists.txt
vendored
4
sdk/lib/3rdparty/freetype/CMakeLists.txt
vendored
|
@ -60,6 +60,8 @@ list(APPEND SOURCE
|
|||
|
||||
add_library(freetype ${SOURCE})
|
||||
|
||||
if(USE_CLANG_CL)
|
||||
if(GCC)
|
||||
target_compile_options(freetype PRIVATE -fno-builtin-malloc)
|
||||
elseif(USE_CLANG_CL)
|
||||
target_compile_options(freetype PRIVATE "-Wno-tautological-constant-compare")
|
||||
endif()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue