tech
/
worldspawn
2
0
Fork 0
Code Issues 16 Pull Requests Projects Releases Wiki Activity

Tweak Makefile flag order slightly

This commit is contained in:
Marco Cawthorne 2021-08-08 17:10:20 +02:00
parent 112889020f
commit 6a6b6e3555
12 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gtkutil/Makefile
View File

@ -1,6 +1,6 @@
# WorldSpawn Makefile
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) $(shell pkg-config --cflags cairo)
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLEXT_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2

2
plugins/archivezip/Makefile
View File

@ -13,7 +13,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libarchivezip.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
archive.o: archive.cpp archive.h

2
plugins/brushexport/Makefile
View File

@ -16,7 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libbrushexport.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a
$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
# object files
callbacks.o: callbacks.cpp callbacks.h

2
plugins/entity/Makefile
View File

@ -26,7 +26,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libentity.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
eclassmodel.o: eclassmodel.cpp eclassmodel.h

2
plugins/image/Makefile
View File

@ -19,7 +19,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libimage.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a
$(CXX) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a $(PLUGIN_LDFLAGS)
# object files
bmp.o: bmp.cpp bmp.h

3
plugins/iqmmodel/Makefile
View File

@ -16,8 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libiqmmodel.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
iqm.o: iqm.cpp iqm.h

3
plugins/mapq3/Makefile
View File

@ -16,8 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libmapq3.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
parse.o: parse.cpp parse.h

3
plugins/model/Makefile
View File

@ -16,8 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libmodel.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a
$(CXX) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a $(PLUGIN_LDFLAGS)
# object files
model.o: model.cpp model.h

2
plugins/prtview/Makefile
View File

@ -16,7 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libprtview.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a
$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a $(PLUGIN_LDFLAGS)
# object files
AboutDialog.o: AboutDialog.cpp AboutDialog.h

3
plugins/shaders/Makefile
View File

@ -16,8 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libshaders.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
shaders.o: shaders.cpp shaders.h

3
plugins/vfspk3/Makefile
View File

@ -16,8 +16,7 @@ WS_OBJS = \
# binary target
../../build/plugins/libvfspk3.so: $(WS_OBJS)
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS) ../../libs/libfilematch.a
$(CXX) -o $@ $(WS_OBJS) ../../libs/libfilematch.a $(PLUGIN_LDFLAGS)
# object files
archive.o: archive.cpp archive.h

4
src/Makefile
View File

@ -1,7 +1,7 @@
# WorldSpawn Makefile
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) $(shell pkg-config --cflags cairo)
GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) $(shell pkg-config --libs cairo)
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)