kyush/principia
1
0
Fork 0
forked from mirrors/principia
Code Pull requests Activity Actions

Gather CFLAGS and LIBS for SDL2-libraries in configure step

Browse source
This commit is contained in:
Rasmus Karlsson 2022-09-17 14:19:35 +02:00
commit 84bed0195c
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build-linux/Makefile.am
View file

@ -12,7 +12,11 @@ GLOBAL_FLAGS := -DGL_GLEXT_PROTOTYPES \
GLOBAL_FLAGS += -I../src/tms/backends/linux/ \
-I../src/src/ -I../src/ -I/usr/include/ \
-I/usr/include/SDL2/ \
${SDL2_CFLAGS} \
${SDL2_TTF_CFLAGS} \
${SDL2_GFX_CFLAGS} \
${SDL2_IMAGE_CFLAGS} \
${SDL2_MIXER_CFLAGS} \
-I../src/include/ \
-I../src/gtk-undo \
-DGLEW_STATIC \
@ -24,7 +28,7 @@ apparatus2_CFLAGS = ${GLOBAL_FLAGS} -std=gnu99 -DFT2_BUILD_LIBRARY\
-DLOAD_PCX -DLOAD_PNM -DLOAD_TGA -DLOAD_XCF -DLOAD_XPM \
-DLOAD_XV
apparatus2_CXXFLAGS = ${GLOBAL_FLAGS}
apparatus2_LDADD = -lz -ldl -lGL -lpthread -lX11 -lXi -lrt ${GTK_LIBS} -lcurl -ljpeg -lpng -lfreetype -lSDL2 -lSDL2_ttf -lSDL2_mixer -lSDL2_image -lSDL2_gfx
apparatus2_LDADD = -lz -ldl -lGL -lpthread -lX11 -lXi -lrt ${GTK_LIBS} -lcurl -ljpeg -lpng -lfreetype ${SDL2_LIBS} ${SDL2_TTF_LIBS} ${SDL2_GFX_LIBS} ${SDL2_IMAGE_LIBS} ${SDL2_MIXER_LIBS}
apparatus2_LDFLAGS =
apparatus2_SOURCES = \

6
build-linux/configure.ac
View file

@ -8,5 +8,11 @@ AC_PROG_CXX
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0)
PKG_CHECK_MODULES(SDL2, sdl2 >= 2.0.0)
PKG_CHECK_MODULES(SDL2_TTF, SDL2_ttf >= 2.0.0)
PKG_CHECK_MODULES(SDL2_GFX, SDL2_gfx >= 1.0.0)
PKG_CHECK_MODULES(SDL2_IMAGE, SDL2_image >= 2.0.0)
PKG_CHECK_MODULES(SDL2_MIXER, SDL2_mixer >= 2.0.0)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT