vera/vmap
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Building fixes from the Win32 branch. (#19)

Browse source 
To make sure the repo is back in-sync

Co-authored-by: Marco Hladik <marco@icculus.org>
Reviewed-on: https://git.vera-visions.com:3000/tech/worldspawn/pulls/19
This commit is contained in:
Marco Cawthorne 2022-05-13 09:34:58 -07:00
parent 743aa026a4
commit f753e6f3ba
20 changed files with 67 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/globaldefs.h
View file

@ -25,7 +25,7 @@
// OS // OS
#if defined(POSIX) || defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) #if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
#define GDEF_OS_POSIX 1 #define GDEF_OS_POSIX 1
#define XWINDOWS 1 #define XWINDOWS 1
#else #else

3
libs/uilib/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -DGTK_TARGET=2
DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) -static -fPIC $(LIB_CFLAGS) -o $@ -c $<
.cpp.o: .cpp.o:

5
plugins/archivepak/Makefile
View file

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

9
plugins/archivezip/Makefile
View file

@ -1,7 +1,10 @@
# WorldSpawn Plugin Makefile # WorldSpawn Plugin Makefile
ZLIB_LDFLAGS=$(shell pkg-config --libs zlib)
PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden PLUGIN_CFLAGS=$(CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) -shared $(ZLIB_LDFLAGS)
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -12,7 +15,7 @@ WS_OBJS = \
archive.o plugin.o archive.o plugin.o
# binary target # binary target
../../build/plugins/libarchivezip.so: $(WS_OBJS) ../../build/plugins/libarchivezip.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -20,4 +23,4 @@ archive.o: archive.cpp archive.h
plugin.o: plugin.cpp zlibstream.h plugin.o: plugin.cpp zlibstream.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
callbacks.o export.o interface.o plugin.o support.o callbacks.o export.o interface.o plugin.o support.o
# binary target # 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) $(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -26,4 +27,4 @@ plugin.o: plugin.cpp plugin.h
support.o: support.cpp support.h support.o: support.cpp support.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -25,7 +26,7 @@ WS_OBJS = \
targetable.o targetable.o
# binary target # binary target
../../build/plugins/libentity.so: $(WS_OBJS) ../../build/plugins/libentity.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -42,4 +43,4 @@ skincache.o: skincache.cpp skincache.h
targetable.o: targetable.cpp targetable.h targetable.o: targetable.cpp targetable.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(JPEG_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) $(JPEG_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) $(JPEG_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< 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 bmp.o dds.o image.o jpeg.o ktx.o pcx.o tga.o
# binary target # 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) $(CXX) -o $@ $(WS_OBJS) ../../libs/libddslib.a ../../libs/libetclib.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -31,4 +32,4 @@ pcx.o: pcx.cpp pcx.h
tga.o: tga.cpp tga.h tga.o: tga.cpp tga.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
hlw.o imagehl.o mip.o sprite.o hlw.o imagehl.o mip.o sprite.o
# binary target # 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) $(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -25,4 +26,4 @@ mip.o: mip.cpp mip.h
sprite.o: sprite.cpp sprite.h sprite.o: sprite.cpp sprite.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
iqm.o plugin.o iqm.o plugin.o
# binary target # binary target
../../build/plugins/libiqmmodel.so: $(WS_OBJS) ../../build/plugins/libiqmmodel.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -23,4 +24,4 @@ iqm.o: iqm.cpp iqm.h
plugin.o: plugin.cpp plugin.h plugin.o: plugin.cpp plugin.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
parse.o plugin.o write.o parse.o plugin.o write.o
# binary target # binary target
../../build/plugins/libmapq3.so: $(WS_OBJS) ../../build/plugins/libmapq3.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -24,4 +25,4 @@ plugin.o: plugin.cpp
write.o: write.cpp write.h write.o: write.cpp write.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
shaders.o plugin.o shaders.o plugin.o
# binary target # binary target
../../build/plugins/libmatsys.so: $(WS_OBJS) ../../build/plugins/libmatsys.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -23,4 +24,4 @@ shaders.o: shaders.cpp shaders.h
plugin.o: plugin.cpp plugin.o: plugin.cpp
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
model.o plugin.o model.o plugin.o
# binary target # binary target
../../build/plugins/libmodel.so: $(WS_OBJS) ../../build/plugins/libmodel.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) ../../libs/libpicomodel.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -23,4 +24,4 @@ model.o: model.cpp model.h
plugin.o: plugin.cpp plugin.o: plugin.cpp
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
AboutDialog.o ConfigDialog.o LoadPortalFileDialog.o portals.o prtview.o AboutDialog.o ConfigDialog.o LoadPortalFileDialog.o portals.o prtview.o
# binary target # 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) $(CXX) -o $@ $(WS_OBJS) ../../libs/libuilib.a ../../libs/libgtkutil.a ../../libs/libprofile.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -26,4 +27,4 @@ portals.o: portals.cpp portals.h
prtview.o: prtview.cpp prtview.h prtview.o: prtview.cpp prtview.h
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
shaders.o plugin.o shaders.o plugin.o
# binary target # binary target
../../build/plugins/libshaders.so: $(WS_OBJS) ../../build/plugins/libshaders.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(PLUGIN_LDFLAGS)
# object files # object files
@ -23,4 +24,4 @@ shaders.o: shaders.cpp shaders.h
plugin.o: plugin.cpp plugin.o: plugin.cpp
clean: 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../../include -I../../libs -fPIC -fvisibility=hidden
PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared PLUGIN_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -shared
LIB_EXT=so
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<
@ -15,7 +16,7 @@ WS_OBJS = \
archive.o vfs.o vfspk3.o archive.o vfs.o vfspk3.o
# binary target # binary target
../../build/plugins/libvfspk3.so: $(WS_OBJS) ../../build/plugins/libvfspk3.$(LIB_EXT): $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) ../../libs/libfilematch.a $(PLUGIN_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) ../../libs/libfilematch.a $(PLUGIN_LDFLAGS)
# object files # object files
@ -24,4 +25,4 @@ vfs.o: vfs.cpp vfs.h
vfspk3.o: vfspk3.cpp vfspk3.o: vfspk3.cpp
clean: clean:
-rm -f *.o ../../build/plugins/libvfspk3.so -rm -f *.o ../../build/plugins/libvfspk3.$(LIB_EXT)

20
src/Makefile
View file

@ -1,18 +1,23 @@
# WorldSpawn Makefile # WorldSpawn Makefile
# may be needed under msys2
GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0)
GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) GTK_CFLAGS=$(shell pkg-config --cflags gtk+-2.0)
GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) GTK_LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
GLIB_LDLAGS=$(shell pkg-config --libs glib-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)
GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0) GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
GLEXT_LDFLAGS=$(shell pkg-config --libs gtkglext-1.0) GLEXT_LDFLAGS=$(shell pkg-config --libs gtkglext-1.0)
PANGO_CFLAGS=$(shell pkg-config --cflags pango)
PANGO_LDFLAGS=$(shell pkg-config --libs pango)
PANGOFT2_CFLAGS=$(shell pkg-config --cflags pangoft2)
PANGOFT2_LDFLAGS=$(shell pkg-config --libs pangoft2)
WS_LIBS= ../libs/libcmdlib.a \ WS_LIBS= ../libs/libcmdlib.a \
../libs/libcontainer.a \ ../libs/libcontainer.a \
../libs/libddslib.a \ ../libs/libddslib.a \
@ -35,8 +40,8 @@ WS_LIBS= ../libs/libcmdlib.a \
../libs/libuilib.a \ ../libs/libuilib.a \
../libs/libxmllib.a ../libs/libxmllib.a
WS_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION)
WS_LDFLAGS=$(LDFLAGS) -lm $(GLIB_LDFLAGS) $(GTK_LDFLAGS) $(XML_LDFLAGS) $(GLEXT_LDFLAGS) -L../lib $(WS_LIBS) 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 $< DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<
@ -81,6 +86,7 @@ WS_OBJS = \
image.o \ image.o \
main.o \ main.o \
mainframe.o \ mainframe.o \
multimon.o \
map.o \ map.o \
mru.o \ mru.o \
nullmodel.o \ nullmodel.o \
@ -127,7 +133,7 @@ WS_OBJS = \
# binary target # binary target
../build/worldspawn: $(WS_OBJS) ../build/worldspawn: $(WS_OBJS)
$(CXX) -o $@ $(WS_OBJS) $(WS_LDFLAGS) $(CXX) -o $@ $(WS_OBJS) $(WS_LIBS) $(WS_LDFLAGS)
clean: clean:
-rm -f *.o ../build/worldspawn -rm -f *.o ../build/worldspawn

6
src/multimon.cpp
View file

@ -19,14 +19,13 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if defined(GDEF_OS_WINDOWS)
#include "multimon.h" #include "multimon.h"
#include "debugging/debugging.h" #include "debugging/debugging.h"
#include "gtkutil/window.h" #include "gtkutil/window.h"
#include "preferences.h" #include "preferences.h"
multimon_globals_t g_multimon_globals; multimon_globals_t g_multimon_globals;
LatchedValue<bool> g_Multimon_enableSysMenuPopups(false, "Floating windows sysmenu icons"); LatchedValue<bool> g_Multimon_enableSysMenuPopups(false, "Floating windows sysmenu icons");
@ -102,3 +101,4 @@ void MultiMon_Construct()
void MultiMon_Destroy() void MultiMon_Destroy()
{ {
} }
#endif

4
tools/Makefile
View file

@ -24,7 +24,7 @@ PNG_CFLAGS=$(shell pkg-config --cflags libpng)
PNG_LDFLAGS=$(shell pkg-config --libs 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_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS) $(MINIZIP_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) -I../include -I./common -I../libs
VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -lm -lpthread -L../lib $(LIBOBJS) VMAP_LDFLAGS=$(LDFLAGS) -lm -lpthread -L../lib $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS)
DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $< DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<
@ -91,7 +91,7 @@ VMAP_OBJS = \
# binary target # binary target
../build/vmap: $(VMAP_OBJS) ../build/vmap: $(VMAP_OBJS)
$(CXX) -o $@ $(VMAP_OBJS) $(VMAP_LDFLAGS) $(CXX) -o $@ $(VMAP_OBJS) $(LIBOBJS) $(VMAP_LDFLAGS)
clean: clean:
-rm -f ./common/*.o -rm -f ./common/*.o