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

WorldSpawn and VMAP now fully build under MSYS2.

This commit is contained in:
Marco Cawthorne 2022-05-08 09:41:15 -07:00
parent 743aa026a4
commit 0aea808d7d
5 changed files with 21 additions and 12 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
#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

3
libs/uilib/Makefile
View File

@ -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:

4
plugins/archivezip/Makefile
View File

@ -1,7 +1,9 @@
# 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)
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<

20
src/Makefile
View File

@ -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 -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
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

4
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) $(GLIB_LDFLAGS) $(XML_LDFLAGS) $(MINIZIP_LDFLAGS) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -lm -lpthread -L../lib $(LIBOBJS)
VMAP_LDFLAGS=$(LDFLAGS) -lm -lws2_32 -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