From 6d7c713252295e2ae9ed65d102f6538c906090d3 Mon Sep 17 00:00:00 2001 From: NagyD Date: Sat, 24 Dec 2022 14:46:20 +0100 Subject: [PATCH] Added SDL2_ttf to Makefile and other similar files. --- src/CMakeLists.txt | 6 +++--- src/Makefile | 4 ++-- src/NMakefile | 2 +- src/build.bat | 2 +- src/port_release.dev | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e54a342c..6f8cbe13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -114,9 +114,9 @@ else() endif() if(WIN32) - target_link_libraries(prince mingw32 SDL2main SDL2 SDL2_image) + target_link_libraries(prince mingw32 SDL2main SDL2 SDL2_image SDL2_ttf) elseif(APPLE) - target_link_libraries(prince SDL2main SDL2 SDL2_image m) + target_link_libraries(prince SDL2main SDL2 SDL2_image SDL2_ttf m) else() # Linux, *BSD, etc. - target_link_libraries(prince SDL2 SDL2_image m) + target_link_libraries(prince SDL2 SDL2_image SDL2_ttf m) endif() diff --git a/src/Makefile b/src/Makefile index 23161557..f478bb99 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,8 +12,8 @@ OS := $(shell uname) CPPFLAGS += -Wall -D_GNU_SOURCE=1 CFLAGS += -std=gnu99 -O2 -LIBS := $(shell pkg-config --libs sdl2 SDL2_image) -CFLAGS += $(shell pkg-config --cflags sdl2 SDL2_image) +LIBS := $(shell pkg-config --libs sdl2 SDL2_image SDL2_ttf) +CFLAGS += $(shell pkg-config --cflags sdl2 SDL2_image SDL2_ttf) ifeq ($(OS),Darwin) CPPFLAGS += -D_THREAD_SAFE -DOSX diff --git a/src/NMakefile b/src/NMakefile index 5415101b..a29cf11d 100644 --- a/src/NMakefile +++ b/src/NMakefile @@ -2,7 +2,7 @@ OBJ = main.obj data.obj seg000.obj seg001.obj seg002.obj seg003.obj seg004.obj seg005.obj seg006.obj seg007.obj seg008.obj seg009.obj seqtbl.obj replay.obj options.obj lighting.obj screenshot.obj menu.obj midi.obj opl3.obj stb_vorbis.c sdl = "..\SDL2-2.0.4" -LIBS = $(sdl)\lib\x86\SDL2main.lib $(sdl)\lib\x86\SDL2.lib $(sdl)\lib\x86\SDL2_image.lib +LIBS = $(sdl)\lib\x86\SDL2main.lib $(sdl)\lib\x86\SDL2.lib $(sdl)\lib\x86\SDL2_image.lib $(sdl)\lib\x86\SDL2_ttf.lib cc = cl /c link = link /subsystem:windows diff --git a/src/build.bat b/src/build.bat index e1e22c9c..c53c29d6 100644 --- a/src/build.bat +++ b/src/build.bat @@ -54,7 +54,7 @@ set PreprocessorDefinitions= :compile set SourceFiles= main.c data.c seg000.c seg001.c seg002.c seg003.c seg004.c seg005.c seg006.c seg007.c seg008.c seg009.c seqtbl.c replay.c options.c lighting.c screenshot.c menu.c midi.c opl3.c stb_vorbis.c set CommonCompilerFlags= /nologo /MP /fp:fast /GR- /wd4048 %PreprocessorDefinitions% /I"%SDL2%\include" -set CommonLinkerFlags= /subsystem:windows,5.01 /libpath:"%SDL2%\lib\%VSCMD_ARG_TGT_ARCH%" SDL2main.lib SDL2.lib SDL2_image.lib icon.res /out:..\prince.exe +set CommonLinkerFlags= /subsystem:windows,5.01 /libpath:"%SDL2%\lib\%VSCMD_ARG_TGT_ARCH%" SDL2main.lib SDL2.lib SDL2_image.lib SDL2_ttf.lib icon.res /out:..\prince.exe rc /nologo /fo icon.res icon.rc cl %BuildTypeCompilerFlags% %CommonCompilerFlags% %SourceFiles% /link %CommonLinkerFlags% diff --git a/src/port_release.dev b/src/port_release.dev index 144abb46..cc929267 100644 --- a/src/port_release.dev +++ b/src/port_release.dev @@ -12,7 +12,7 @@ ResourceIncludes= MakeIncludes= Compiler=-Wall -std=gnu99_@@_-O2_@@_ CppCompiler=-Wall_@@_-O2_@@_ -Linker=-l"mingw32"_@@_-l"SDL2main"_@@_-l"SDL2.dll"_@@_-l"SDL2_image"_@@_ +Linker=-l"mingw32"_@@_-l"SDL2main"_@@_-l"SDL2.dll"_@@_-l"SDL2_image"_@@_-l"SDL2_ttf"_@@_ IsCpp=0 Icon=port_release.ico ExeOutput=