Fix AerofoilX

This commit is contained in:
elasota
2021-04-07 11:42:57 -04:00
parent 7842e721e5
commit b90d0c303c
4 changed files with 4 additions and 104 deletions

View File

@@ -12,53 +12,6 @@ add_library(stb STATIC
stb/stb_image_write.c
)
add_library(FreeType STATIC
FreeType/freetype/src/base/ftbase.c
FreeType/freetype/src/base/ftbitmap.c
FreeType/freetype/src/base/ftdebug.c
FreeType/freetype/src/base/ftinit.c
FreeType/freetype/src/base/ftsystem.c
FreeType/freetype/src/winfonts/winfnt.c
FreeType/freetype/src/autofit/autofit.c
FreeType/freetype/src/bdf/bdf.c
FreeType/freetype/src/cff/cff.c
FreeType/freetype/src/gzip/ftgzip.c
FreeType/freetype/src/lzw/ftlzw.c
FreeType/freetype/src/pcf/pcf.c
FreeType/freetype/src/pfr/pfr.c
FreeType/freetype/src/psaux/psaux.c
FreeType/freetype/src/pshinter/pshinter.c
FreeType/freetype/src/psnames/psnames.c
FreeType/freetype/src/raster/raster.c
FreeType/freetype/src/sfnt/sfnt.c
FreeType/freetype/src/smooth/smooth.c
FreeType/freetype/src/truetype/truetype.c
FreeType/freetype/src/type1/type1.c
FreeType/freetype/src/cid/type1cid.c
FreeType/freetype/src/type42/type42.c
)
target_compile_options(FreeType PRIVATE -ansi)
target_compile_definitions(FreeType PRIVATE -DFT2_BUILD_LIBRARY)
target_include_directories(FreeType PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FreeType/freetype/include>
)
add_library(GpFontHandler_FreeType2 STATIC
GpFontHandler_FreeType2/GpFontHandler_FreeType2.cpp
)
target_include_directories(GpFontHandler_FreeType2 PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/GpCommon>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Common>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/FreeType/freetype/include>
)
target_link_libraries(GpFontHandler_FreeType2 FreeType)
add_library(zlib STATIC
zlib/adler32.c
zlib/crc32.c
@@ -281,8 +234,6 @@ if(CMAKE_HOST_UNIX)
add_executable(AerofoilX
AerofoilPortable/GpSystemServices_POSIX.cpp
AerofoilPortable/GpThreadEvent_Cpp11.cpp
AerofoilPortable/GpFiber_Thread.cpp
AerofoilPortable/GpFiberStarter_Thread.cpp
AerofoilSDL/GpAudioDriver_SDL2.cpp
AerofoilSDL/GpDisplayDriver_SDL_GL2.cpp
AerofoilSDL/GpInputDriver_SDL_Gamepad.cpp
@@ -307,7 +258,7 @@ if(CMAKE_HOST_UNIX)
${SDL2_INCLUDE_DIRS}
)
target_link_libraries(AerofoilX ${SDL2_LIBRARIES} GpApp GpShell GpFontHandler_FreeType2)
target_link_libraries(AerofoilX ${SDL2_LIBRARIES} GpApp GpShell)
endif()