Skip to content

Commit

Permalink
Make using system tinyxml default on linux
Browse files Browse the repository at this point in the history
Keep bundled version intact for use on Windows, but allow simple
switching to bundled library.
  • Loading branch information
pemensik committed May 5, 2024
1 parent 42dac04 commit cd44019
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ CXX = clang++
CC = clang

# more recent tinyxml does not work
#TINYXML_CFLAGS = `pkg-config --cflags tinyxml`
#TINYXML_LIBS = `pkg-config --libs tinyxml`
TINYXML_CFLAGS = -Isrc/tinyxml_2_5_3/tinyxml
TINYXML_LIBS = # bundled source
TINYXML_CFLAGS = `pkg-config --cflags tinyxml`
TINYXML_LIBS = `pkg-config --libs tinyxml`
#TINYXML_CFLAGS = -Isrc/tinyxml_2_5_3/tinyxml
#TINYXML_LIBS = # bundled source

SDL2_CFLAGS = `pkg-config --cflags sdl2`
SDL2_LIBS = `pkg-config --libs sdl2`
Expand All @@ -206,6 +206,7 @@ GLIB2_CFLAGS = `pkg-config --cflags glib-2.0`
GLIB2_LIBS = `pkg-config --libs glib-2.0`
GLEW_CFLAGS = `pkg-config --cflags glew`
GLEW_LIBS = `pkg-config --libs glew`

LIBS = \
$(TINYXML_LIBS) \
$(SDL2_LIBS) \
Expand Down

0 comments on commit cd44019

Please sign in to comment.