Tweak Makefile flag order slightly
This commit is contained in:
parent
112889020f
commit
6a6b6e3555
|
@ -1,6 +1,6 @@
|
||||||
# WorldSpawn Makefile
|
# 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)
|
GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
|
||||||
|
|
||||||
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLEXT_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2
|
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLEXT_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2
|
||||||
|
|
|
@ -13,7 +13,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libarchivezip.so: $(WS_OBJS)
|
../../build/plugins/libarchivezip.so: $(WS_OBJS)
|
||||||
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
|
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
archive.o: archive.cpp archive.h
|
archive.o: archive.cpp archive.h
|
||||||
|
|
|
@ -16,7 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libbrushexport.so: $(WS_OBJS)
|
../../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
|
# object files
|
||||||
callbacks.o: callbacks.cpp callbacks.h
|
callbacks.o: callbacks.cpp callbacks.h
|
||||||
|
|
|
@ -26,7 +26,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libentity.so: $(WS_OBJS)
|
../../build/plugins/libentity.so: $(WS_OBJS)
|
||||||
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
|
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
eclassmodel.o: eclassmodel.cpp eclassmodel.h
|
eclassmodel.o: eclassmodel.cpp eclassmodel.h
|
||||||
|
|
|
@ -19,7 +19,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libimage.so: $(WS_OBJS)
|
../../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
|
# object files
|
||||||
bmp.o: bmp.cpp bmp.h
|
bmp.o: bmp.cpp bmp.h
|
||||||
|
|
|
@ -16,8 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libiqmmodel.so: $(WS_OBJS)
|
../../build/plugins/libiqmmodel.so: $(WS_OBJS)
|
||||||
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
|
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
iqm.o: iqm.cpp iqm.h
|
iqm.o: iqm.cpp iqm.h
|
||||||
|
|
|
@ -16,8 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libmapq3.so: $(WS_OBJS)
|
../../build/plugins/libmapq3.so: $(WS_OBJS)
|
||||||
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
|
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
parse.o: parse.cpp parse.h
|
parse.o: parse.cpp parse.h
|
||||||
|
|
|
@ -16,8 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libmodel.so: $(WS_OBJS)
|
../../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
|
# object files
|
||||||
model.o: model.cpp model.h
|
model.o: model.cpp model.h
|
||||||
|
|
|
@ -16,7 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libprtview.so: $(WS_OBJS)
|
../../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
|
# object files
|
||||||
AboutDialog.o: AboutDialog.cpp AboutDialog.h
|
AboutDialog.o: AboutDialog.cpp AboutDialog.h
|
||||||
|
|
|
@ -16,8 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libshaders.so: $(WS_OBJS)
|
../../build/plugins/libshaders.so: $(WS_OBJS)
|
||||||
$(CXX) $(PLUGIN_LDFLAGS) -o $@ $(WS_OBJS)
|
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# object files
|
# object files
|
||||||
shaders.o: shaders.cpp shaders.h
|
shaders.o: shaders.cpp shaders.h
|
||||||
|
|
|
@ -16,8 +16,7 @@ WS_OBJS = \
|
||||||
|
|
||||||
# binary target
|
# binary target
|
||||||
../../build/plugins/libvfspk3.so: $(WS_OBJS)
|
../../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
|
# object files
|
||||||
archive.o: archive.cpp archive.h
|
archive.o: archive.cpp archive.h
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# WorldSpawn Makefile
|
# 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)
|
||||||
GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) $(shell pkg-config --libs cairo)
|
GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
|
||||||
|
|
||||||
XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
|
XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
|
||||||
XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)
|
XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)
|
||||||
|
|
Loading…
Reference in New Issue