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

Use pkg-config for gtkglext and some others

Browse source
This commit is contained in:
Marco Cawthorne 2021-06-07 08:20:34 +02:00
parent 34d21fcc05
commit cfd78e199f
13 changed files with 77 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/gtkutil/Makefile
View file

@ -1,7 +1,9 @@
# 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/usr/include/gtkglext-1.0 -I/usr/lib64/gtkglext-1.0/include/ -I../../libs -DGTK_TARGET=2 GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
LIB_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(GLEXT_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:
@ -26,7 +28,7 @@ paned.o \
toolbar.o \ toolbar.o \
widget.o \ widget.o \
window.o \ window.o \
xorrectangle.o \ xorrectangle.o
# binary target # binary target
../libgtkutil.a: $(WS_OBJS) ../libgtkutil.a: $(WS_OBJS)

3
plugins/brushexport/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Plugin Makefile # WorldSpawn Plugin Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/entity/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

10
plugins/image/Makefile
View file

@ -1,9 +1,13 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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 -ljpeg JPEG_CFLAGS=$(shell pkg-config --cflags libjpeg)
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
DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(PLUGIN_CFLAGS) -o $@ -c $<

3
plugins/iqmmodel/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/mapq3/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/model/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/prtview/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Plugin Makefile # WorldSpawn Plugin Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/shaders/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

3
plugins/vfspk3/Makefile
View file

@ -1,7 +1,8 @@
# WorldSpawn Makefile # WorldSpawn Makefile
GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2 GLIB_CFLAGS=$(shell pkg-config --cflags gtk+-2.0) -DGTK_TARGET=2
GLIB_LDFLAGS=$(shell pkg-config --libs gtk+-2.0) 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

52
src/Makefile
View file

@ -3,30 +3,36 @@
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)
WS_LIBS= ../libs/libcmdlib.a \ XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
../libs/libcontainer.a \ XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)
../libs/libddslib.a \
../libs/libdebugging.a \
../libs/libetclib.a \
../libs/libgeneric.a \
../libs/libgtkutil.a \
../libs/libl_net.a \
../libs/libmath.a \
../libs/libmathlib.a \
../libs/libmodulesystem.a \
../libs/libos.a \
../libs/libpicomodel.a \
../libs/libprofile.a \
../libs/libscript.a \
../libs/libsignal.a \
../libs/libsplines.a \
../libs/libstream.a \
../libs/libstring.a \
../libs/libuilib.a \
../libs/libxmllib.a
WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION) GLEXT_CFLAGS=$(shell pkg-config --cflags gtkglext-1.0)
WS_LDFLAGS=$(LDFLAGS) -lm $(GTK_LDFLAGS) -lX11 -lGL -lxml2 -lgdkglext-x11-1.0 -lgtkglext-x11-1.0 -L../lib $(WS_LIBS) GLEXT_LDFLAGS=$(shell pkg-config --libs gtkglext-1.0)
WS_LIBS= ../libs/libcmdlib.a \
../libs/libcontainer.a \
../libs/libddslib.a \
../libs/libdebugging.a \
../libs/libetclib.a \
../libs/libgeneric.a \
../libs/libgtkutil.a \
../libs/libl_net.a \
../libs/libmath.a \
../libs/libmathlib.a \
../libs/libmodulesystem.a \
../libs/libos.a \
../libs/libpicomodel.a \
../libs/libprofile.a \
../libs/libscript.a \
../libs/libsignal.a \
../libs/libsplines.a \
../libs/libstream.a \
../libs/libstring.a \
../libs/libuilib.a \
../libs/libxmllib.a
WS_CFLAGS=$(CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) $(GLEXT_CFLAGS) -I../include -I../libs -DGTK_TARGET=2 $(WS_VERSION)
WS_LDFLAGS=$(LDFLAGS) -lm $(GTK_LDFLAGS) $(XML_LDFLAGS) $(GLEXT_LDFLAGS) -L../lib $(WS_LIBS)
DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $< DO_CXX=$(CXX) $(WS_CFLAGS) -o $@ -c $<

2
src/qgl.cpp
View file

@ -561,7 +561,7 @@ int QGL_Init(OpenGLBinding &table)
qwglGetProcAddress = wglGetProcAddress; qwglGetProcAddress = wglGetProcAddress;
#elif defined( XWINDOWS ) #elif defined( XWINDOWS )
qglXGetProcAddressARB = (glXGetProcAddressARBProc) dlsym(RTLD_DEFAULT, "glXGetProcAddressARB"); qglXGetProcAddressARB = (glXGetProcAddressARBProc) dlsym(RTLD_DEFAULT, "glXGetProcAddressARB");
if ((qglXQueryExtension == 0) || (qglXQueryExtension(XOpenDisplay(nullptr), 0, 0) != True)) { if ((qglXQueryExtension == 0)) {
return 0; return 0;
} }
#elif GDEF_OS_MACOS #elif GDEF_OS_MACOS

27
tools/Makefile
View file

@ -2,16 +2,29 @@
# ws libs vmap uses # ws libs vmap uses
LIBOBJS=../libs/libddslib.a \ LIBOBJS=../libs/libddslib.a \
../libs/libetclib.a \ ../libs/libetclib.a \
../libs/libfilematch.a \ ../libs/libfilematch.a \
../libs/libl_net.a \ ../libs/libl_net.a \
../libs/libmathlib.a \ ../libs/libmathlib.a \
../libs/libpicomodel.a ../libs/libpicomodel.a
GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0) GLIB_CFLAGS=$(shell pkg-config --cflags glib-2.0)
GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0) GLIB_LDFLAGS=$(shell pkg-config --libs glib-2.0)
VMAP_CFLAGS=$(CFLAGS) $(GLIB_CFLAGS) -I../include -I./common -I../libs -Wno-narrowing
VMAP_LDFLAGS=$(LDFLAGS) $(GLIB_LDFLAGS) -lm -lpthread -L../lib -lxml2 -ljpeg -lpng -lminizip $(LIBOBJS) XML_CFLAGS=$(shell pkg-config --cflags libxml-2.0)
XML_LDFLAGS=$(shell pkg-config --libs libxml-2.0)
MINIZIP_CFLAGS=$(shell pkg-config --cflags minizip)
MINIZIP_LDFLAGS=$(shell pkg-config --libs minizip)
JPEG_CFLAGS=$(shell pkg-config --cflags libjpeg)
JPEG_LDFLAGS=$(shell pkg-config --libs libjpeg)
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)
DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $< DO_CC=$(CC) $(VMAP_CFLAGS) -o $@ -c $<