Skip to content

Commit

Permalink
Added SDL2_ttf to Makefile and other similar files.
Browse files Browse the repository at this point in the history
  • Loading branch information
NagyD committed Dec 24, 2022
1 parent 0e286b1 commit 6d7c713
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Expand Up @@ -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()
4 changes: 2 additions & 2 deletions src/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/NMakefile
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/build.bat
Expand Up @@ -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%
Expand Down
2 changes: 1 addition & 1 deletion src/port_release.dev
Expand Up @@ -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=
Expand Down

0 comments on commit 6d7c713

Please sign in to comment.