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

more cleanup for msys2 building

This commit is contained in:
Marco Cawthorne 2022-05-13 08:52:01 -07:00
parent 0aea808d7d
commit 945b57a9ff
17 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/archivepak/Makefile
View File

@ -1,5 +1,6 @@
# WorldSpawn Plugin Makefile
LIB_EXT=so
PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) -shared
@ -12,7 +13,7 @@ WS_OBJS = \
archive.o plugin.o
# binary target
../../build/plugins/libarchivepak.so: $(WS_OBJS)
../../build/plugins/libarchivepak.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -20,4 +21,4 @@ archive.o: archive.cpp archive.h
plugin.o: plugin.cpp
clean:
-rm -f *.o ../../build/plugins/libarchivepak.so
-rm -f *.o ../../build/plugins/libarchivepak.$(LIB_EXT)

5
plugins/archivewad/Makefile
View File

@ -2,6 +2,7 @@
PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -12,7 +13,7 @@ WS_OBJS = \
archive.o plugin.o
# binary target
../../build/plugins/libarchivewad.so: $(WS_OBJS)
../../build/plugins/libarchivewad.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -20,4 +21,4 @@ archive.o: archive.cpp archive.h
plugin.o: plugin.cpp
clean:
-rm -f *.o ../../build/plugins/libarchivewad.so
-rm -f *.o ../../build/plugins/libarchivewad.$(LIB_EXT)

5
plugins/archivezip/Makefile
View File

@ -4,6 +4,7 @@ ZLIB_LDFLAGS=$(shell pkg-config --libs zlib)
PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) -shared $(ZLIB_LDFLAGS)
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -14,7 +15,7 @@ WS_OBJS = \
archive.o plugin.o
# binary target
../../build/plugins/libarchivezip.so: $(WS_OBJS)
../../build/plugins/libarchivezip.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -22,4 +23,4 @@ archive.o: archive.cpp archive.h
plugin.o: plugin.cpp zlibstream.h
clean:
-rm -f *.o ../../build/plugins/libarchivezip.so
-rm -f *.o ../../build/plugins/libarchivezip.$(LIB_EXT)

5
plugins/brushexport/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
callbacks.o export.o interface.o plugin.o support.o
# binary target
../../build/plugins/libbrushexport.so: $(WS_OBJS)
../../build/plugins/libbrushexport.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
# object files
@ -26,4 +27,4 @@ plugin.o: plugin.cpp plugin.h
support.o: support.cpp support.h
clean:
-rm -f *.o ../../build/plugins/libbrushexport.so
-rm -f *.o ../../build/plugins/libbrushexport.$(LIB_EXT)

5
plugins/entity/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -25,7 +26,7 @@ WS_OBJS = \
targetable.o
# binary target
../../build/plugins/libentity.so: $(WS_OBJS)
../../build/plugins/libentity.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -42,4 +43,4 @@ skincache.o: skincache.cpp skincache.h
targetable.o: targetable.cpp targetable.h
clean:
-rm -f *.o ../../build/plugins/libentity.so
-rm -f *.o ../../build/plugins/libentity.$(LIB_EXT)

5
plugins/image/Makefile
View File

@ -8,6 +8,7 @@ JPEG_LDFLAGS=$(shell pkg-config --libs libjpeg)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(JPEG_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) $(JPEG_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -18,7 +19,7 @@ WS_OBJS = \
bmp.o dds.o image.o jpeg.o ktx.o pcx.o tga.o
# binary target
../../build/plugins/libimage.so: $(WS_OBJS)
../../build/plugins/libimage.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a $(PLUGIN_LDFLAGS)
# object files
@ -31,4 +32,4 @@ pcx.o: pcx.cpp pcx.h
tga.o: tga.cpp tga.h
clean:
-rm -f *.o ../../build/plugins/libimage.so
-rm -f *.o ../../build/plugins/libimage.$(LIB_EXT)

5
plugins/imagehl/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
hlw.o imagehl.o mip.o sprite.o
# binary target
../../build/plugins/libimagehl.so: $(WS_OBJS)
../../build/plugins/libimagehl.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
# object files
@ -25,4 +26,4 @@ mip.o: mip.cpp mip.h
sprite.o: sprite.cpp sprite.h
clean:
-rm -f *.o ../../build/plugins/libimagehl.so
-rm -f *.o ../../build/plugins/libimagehl.$(LIB_EXT)

5
plugins/iqmmodel/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
iqm.o plugin.o
# binary target
../../build/plugins/libiqmmodel.so: $(WS_OBJS)
../../build/plugins/libiqmmodel.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -23,4 +24,4 @@ iqm.o: iqm.cpp iqm.h
plugin.o: plugin.cpp plugin.h
clean:
-rm -f *.o ../../build/plugins/libiqmmodel.so
-rm -f *.o ../../build/plugins/libiqmmodel.$(LIB_EXT)

5
plugins/mapq3/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
parse.o plugin.o write.o
# binary target
../../build/plugins/libmapq3.so: $(WS_OBJS)
../../build/plugins/libmapq3.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -24,4 +25,4 @@ plugin.o: plugin.cpp
write.o: write.cpp write.h
clean:
-rm -f *.o ../../build/plugins/libmapq3.so
-rm -f *.o ../../build/plugins/libmapq3.$(LIB_EXT)

5
plugins/matsys/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
shaders.o plugin.o
# binary target
../../build/plugins/libmatsys.so: $(WS_OBJS)
../../build/plugins/libmatsys.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -23,4 +24,4 @@ shaders.o: shaders.cpp shaders.h
plugin.o: plugin.cpp
clean:
-rm -f *.o ../../build/plugins/libmatsys.so
-rm -f *.o ../../build/plugins/libmatsys.$(LIB_EXT)

5
plugins/model/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
model.o plugin.o
# binary target
../../build/plugins/libmodel.so: $(WS_OBJS)
../../build/plugins/libmodel.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a $(PLUGIN_LDFLAGS)
# object files
@ -23,4 +24,4 @@ model.o: model.cpp model.h
plugin.o: plugin.cpp
clean:
-rm -f *.o ../../build/plugins/libmodel.so
-rm -f *.o ../../build/plugins/libmodel.$(LIB_EXT)

5
plugins/prtview/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
AboutDialog.o ConfigDialog.o LoadPortalFileDialog.o portals.o prtview.o
# binary target
../../build/plugins/libprtview.so: $(WS_OBJS)
../../build/plugins/libprtview.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a $(PLUGIN_LDFLAGS)
# object files
@ -26,4 +27,4 @@ portals.o: portals.cpp portals.h
prtview.o: prtview.cpp prtview.h
clean:
-rm -f *.o ../../build/plugins/libprtview.so
-rm -f *.o ../../build/plugins/libprtview.$(LIB_EXT)

5
plugins/shaders/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
shaders.o plugin.o
# binary target
../../build/plugins/libshaders.so: $(WS_OBJS)
../../build/plugins/libshaders.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files
@ -23,4 +24,4 @@ shaders.o: shaders.cpp shaders.h
plugin.o: plugin.cpp
clean:
-rm -f *.o ../../build/plugins/libshaders.so
-rm -f *.o ../../build/plugins/libshaders.$(LIB_EXT)

5
plugins/vfspk3/Makefile
View File

@ -5,6 +5,7 @@ GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
PLUGIN_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
archive.o vfs.o vfspk3.o
# binary target
../../build/plugins/libvfspk3.so: $(WS_OBJS)
../../build/plugins/libvfspk3.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libfilematch.a $(PLUGIN_LDFLAGS)
# object files
@ -24,4 +25,4 @@ vfs.o: vfs.cpp vfs.h
vfspk3.o: vfspk3.cpp
clean:
-rm -f *.o ../../build/plugins/libvfspk3.so
-rm -f *.o ../../build/plugins/libvfspk3.$(LIB_EXT)

2
resources/Makefile
View File

@ -116,4 +116,4 @@ all:
cp -vf ./bitmaps/window1.xpm ../build/bitmaps/window1.xpm
cp -vf ./bitmaps/window2.xpm ../build/bitmaps/window2.xpm
cp -vf ./bitmaps/window3.xpm ../build/bitmaps/window3.xpm
cp -vf ./bitmaps/window4.xpm ../build/bitmaps/window4.xpm
cp -vf ./bitmaps/window4.xpm ../build/bitmaps/window4.xpm

4
src/Makefile
View File

@ -40,8 +40,8 @@ WS_LIBS= ../libs/libcmdlib.a \
../libs/libuilib.a \
../libs/libxmllib.a
WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 -static-libgcc -static-libstdc++ $(WS_VERSION)
WS_LDFLAGS=$(LDFLAGS) -lm -lws2_32 $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(PANGO_LDFLAGS) $(PANGOFT2_LDFLAGS) $(GLEXT_LDFLAGS) -static-libgcc -static-libstdc++ -L../lib
WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION)
WS_LDFLAGS=$(LDFLAGS) -lm $(GTK_LDFLAGS) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(PANGO_LDFLAGS) $(PANGOFT2_LDFLAGS) $(GLEXT_LDFLAGS) -L../lib
DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<

2
tools/Makefile
View File

@ -24,7 +24,7 @@ PNG_CFLAGS=$(shell pkg-config --cflags libpng)
PNG_LDFLAGS=$(shell pkg-config --libs libpng)
VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(MINIZIP_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) -I../include -I./common -I../libs
VMAP_LDFLAGS=$(LDFLAGS) -lm -lws2_32 -lpthread -L../lib $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS)
VMAP_LDFLAGS=$(LDFLAGS) -lm -lpthread -L../lib $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS)
DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<