From f753e6f3baf2e05fc69e2e587b28904695332d0b Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Fri, 13 May 2022 09:34:58 -0700 Subject: [PATCH] Building fixes from the Win32 branch. (#19) To make sure the repo is back in-sync Co-authored-by: Marco Hladik Reviewed-on: https://git.vera-visions.com:3000/tech/worldspawn/pulls/19 --- libs/globaldefs.h | 2 +- libs/uilib/Makefile | 3 ++- plugins/archivepak/Makefile | 5 +++-- plugins/archivewad/Makefile | 5 +++-- plugins/archivezip/Makefile | 9 ++++++--- plugins/brushexport/Makefile | 5 +++-- plugins/entity/Makefile | 5 +++-- plugins/image/Makefile | 5 +++-- plugins/imagehl/Makefile | 5 +++-- plugins/iqmmodel/Makefile | 5 +++-- plugins/mapq3/Makefile | 5 +++-- plugins/matsys/Makefile | 5 +++-- plugins/model/Makefile | 5 +++-- plugins/prtview/Makefile | 5 +++-- plugins/shaders/Makefile | 5 +++-- plugins/vfspk3/Makefile | 5 +++-- resources/Makefile | 2 +- src/Makefile | 20 +++++++++++++------- src/multimon.cpp | 6 +++--- tools/Makefile | 4 ++-- 20 files changed, 67 insertions(+), 44 deletions(-) diff --git a/libs/globaldefs.h b/libs/globaldefs.h index 19c4623..78f49d0 100644 --- a/libs/globaldefs.h +++ b/libs/globaldefs.h @@ -25,7 +25,7 @@ // 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 XWINDOWS 1 #else diff --git a/libs/uilib/Makefile b/libs/uilib/Makefile index 63739b2..62d24dc 100644 --- a/libs/uilib/Makefile +++ b/libs/uilib/Makefile @@ -1,7 +1,8 @@ # WorldSpawn Makefile 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 $< .cpp.o: diff --git a/plugins/archivepak/Makefile b/plugins/archivepak/Makefile index 3a863f6..6d91d7e 100644 --- a/plugins/archivepak/Makefile +++ b/plugins/archivepak/Makefile @@ -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) diff --git a/plugins/archivewad/Makefile b/plugins/archivewad/Makefile index 0e1adfa..ab561ba 100644 --- a/plugins/archivewad/Makefile +++ b/plugins/archivewad/Makefile @@ -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) diff --git a/plugins/archivezip/Makefile b/plugins/archivezip/Makefile index 3832bf7..430807c 100644 --- a/plugins/archivezip/Makefile +++ b/plugins/archivezip/Makefile @@ -1,7 +1,10 @@ # WorldSpawn Plugin Makefile +ZLIB_LDFLAGS=$(shell pkg-config --libs zlib) + 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 $< @@ -12,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 @@ -20,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) diff --git a/plugins/brushexport/Makefile b/plugins/brushexport/Makefile index f263686..115dbcb 100644 --- a/plugins/brushexport/Makefile +++ b/plugins/brushexport/Makefile @@ -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) diff --git a/plugins/entity/Makefile b/plugins/entity/Makefile index 949b0b0..d6005ec 100644 --- a/plugins/entity/Makefile +++ b/plugins/entity/Makefile @@ -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) diff --git a/plugins/image/Makefile b/plugins/image/Makefile index 3855413..7b8c863 100644 --- a/plugins/image/Makefile +++ b/plugins/image/Makefile @@ -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) diff --git a/plugins/imagehl/Makefile b/plugins/imagehl/Makefile index 353867b..a8738fb 100644 --- a/plugins/imagehl/Makefile +++ b/plugins/imagehl/Makefile @@ -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) diff --git a/plugins/iqmmodel/Makefile b/plugins/iqmmodel/Makefile index 704c39e..3a0d957 100644 --- a/plugins/iqmmodel/Makefile +++ b/plugins/iqmmodel/Makefile @@ -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) diff --git a/plugins/mapq3/Makefile b/plugins/mapq3/Makefile index bd4dfbc..6c41a79 100644 --- a/plugins/mapq3/Makefile +++ b/plugins/mapq3/Makefile @@ -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) diff --git a/plugins/matsys/Makefile b/plugins/matsys/Makefile index 78083ed..9fd0fd8 100644 --- a/plugins/matsys/Makefile +++ b/plugins/matsys/Makefile @@ -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) diff --git a/plugins/model/Makefile b/plugins/model/Makefile index 34b6a8a..bae6d1b 100644 --- a/plugins/model/Makefile +++ b/plugins/model/Makefile @@ -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) \ No newline at end of file diff --git a/plugins/prtview/Makefile b/plugins/prtview/Makefile index 57db968..0cc18dd 100644 --- a/plugins/prtview/Makefile +++ b/plugins/prtview/Makefile @@ -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) diff --git a/plugins/shaders/Makefile b/plugins/shaders/Makefile index a7e045f..0ce814b 100644 --- a/plugins/shaders/Makefile +++ b/plugins/shaders/Makefile @@ -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) diff --git a/plugins/vfspk3/Makefile b/plugins/vfspk3/Makefile index a893dd7..eb28767 100644 --- a/plugins/vfspk3/Makefile +++ b/plugins/vfspk3/Makefile @@ -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) diff --git a/resources/Makefile b/resources/Makefile index 60ba82a..3a0821e 100644 --- a/resources/Makefile +++ b/resources/Makefile @@ -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 \ No newline at end of file diff --git a/src/Makefile b/src/Makefile index e4f35a7..81c14ec 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,18 +1,23 @@ # 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_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_LDFLAGS=$(shell pkg-config --libs libxml-2.0) GLEXT_CFLAGS=$(shell pkg-config --cflags 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 \ ../libs/libcontainer.a \ ../libs/libddslib.a \ @@ -35,8 +40,8 @@ WS_LIBS= ../libs/libcmdlib.a \ ../libs/libuilib.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_LDFLAGS=$(LDFLAGS) -lm $(GLIB_LDFLAGS) $(GTK_LDFLAGS) $(XML_LDFLAGS) $(GLEXT_LDFLAGS) -L../lib $(WS_LIBS) +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 $< @@ -81,6 +86,7 @@ WS_OBJS = \ image.o \ main.o \ mainframe.o \ + multimon.o \ map.o \ mru.o \ nullmodel.o \ @@ -127,7 +133,7 @@ WS_OBJS = \ # binary target ../build/worldspawn: $(WS_OBJS) - $(CXX) -o $@ $(WS_OBJS) $(WS_LDFLAGS) + $(CXX) -o $@ $(WS_OBJS) $(WS_LIBS) $(WS_LDFLAGS) clean: -rm -f *.o ../build/worldspawn diff --git a/src/multimon.cpp b/src/multimon.cpp index 3a4b6b5..ae9dbe7 100644 --- a/src/multimon.cpp +++ b/src/multimon.cpp @@ -19,14 +19,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if defined(GDEF_OS_WINDOWS) + #include "multimon.h" - #include "debugging/debugging.h" - #include "gtkutil/window.h" #include "preferences.h" - multimon_globals_t g_multimon_globals; LatchedValue g_Multimon_enableSysMenuPopups(false, "Floating windows sysmenu icons"); @@ -102,3 +101,4 @@ void MultiMon_Construct() void MultiMon_Destroy() { } +#endif diff --git a/tools/Makefile b/tools/Makefile index 268086d..70fa52b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -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) $(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 $< @@ -91,7 +91,7 @@ VMAP_OBJS = \ # binary target ../build/vmap: $(VMAP_OBJS) - $(CXX) -o $@ $(VMAP_OBJS) $(VMAP_LDFLAGS) + $(CXX) -o $@ $(VMAP_OBJS) $(LIBOBJS) $(VMAP_LDFLAGS) clean: -rm -f ./common/*.o