ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-09 19:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Working with no GTK errors whatsoever, crashes on GL init.

Browse source
This commit is contained in:
jdolan 2013-06-27 09:32:30 -04:00
parent 430696eacf
commit 9237b835f7
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apple/GtkRadiant.app/Contents/MacOS/radiant
View file

@ -21,6 +21,6 @@ export PANGO_SYSCONFDIR="${resources}/etc"
export PANGO_LIBDIR="${resources}/lib" export PANGO_LIBDIR="${resources}/lib"
cd "${resources}/install" cd "${resources}/install"
./radiant.bin $@ ./radiant.bin
set +x set +x

0
apple/GtkRadiant.app/Contents/Resources/etc/gtk-2.0/gtk.immodules
View file

21
apple/Makefile
View file

@ -1,4 +1,4 @@
# Makefile for GtkRadiant, requires http://macdylibbundler.sourceforge.net/ # Makefile for GtkRadiant.app, requires http://macdylibbundler.sourceforge.net/
INSTALL = ../install INSTALL = ../install
TARGET = target TARGET = target
@ -12,7 +12,7 @@ VERSION = 1.6.4
DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg
VOLUME_NAME = "GtkRadiant $(VERSION)" VOLUME_NAME = "GtkRadiant $(VERSION)"
all: install all: install gtk-runtime bundle
pre-install: pre-install:
install -d $(TARGET) install -d $(TARGET)
@ -22,21 +22,32 @@ pre-install:
install: pre-install install: pre-install
cp -r $(INSTALL) $(RESOURCES) cp -r $(INSTALL) $(RESOURCES)
rm -rf `find $(INSTDIR)/installs -type d -name .svn` rm -rf `find $(INSTDIR)/installs -type d -name .svn`
gtk-runtime: gtk-runtime:
gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \ gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
$(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
$(CONFDIR)/gtk-2.0/gtk.immodules
pango-querymodules | sed $(PREFIX_SED_EXPR) > \ pango-querymodules | sed $(PREFIX_SED_EXPR) > \
$(CONFDIR)/pango/pango.modules $(CONFDIR)/pango/pango.modules
cp -r /opt/local/lib/gdk-pixbuf-2.0 $(LIBDIR) cp -r /opt/local/lib/gdk-pixbuf-2.0 $(LIBDIR)
cp -r /opt/local/lib/gtk-2.0 $(LIBDIR)
cp -r /opt/local/lib/pango $(LIBDIR) cp -r /opt/local/lib/pango $(LIBDIR)
find $(LIBDIR) -type f ! -name "*.so" -delete find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete
find $(LIBDIR)/pango -type f ! -name "*.so" -delete
rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
dylibbundler -b \ dylibbundler -b \
`find $(LIBDIR) -type f | xargs -I {} echo -x {}` \ `find $(LIBDIR)/gdk-pixbuf-2.0 -type f | xargs -I {} echo -x {}` \
`find $(LIBDIR)/gtk-2.0 -type f | xargs -I {} echo -x {}` \
`find $(LIBDIR)/pango -type f | xargs -I {} echo -x {}` \
-d $(LIBDIR) -of -p @executable_path/../lib -d $(LIBDIR) -of -p @executable_path/../lib
cp -r /opt/local/share/themes/Default $(RESOURCES)/share cp -r /opt/local/share/themes/Default $(RESOURCES)/share

2
config.py
View file

@ -248,7 +248,7 @@ class Config:
env.Append( LINKFLAGS = '-Wl,-rpath,.' ) env.Append( LINKFLAGS = '-Wl,-rpath,.' )
# On Mac, we pad headers so that we may rewrite them for packaging # On Mac, we pad headers so that we may rewrite them for packaging
if ( self.platform == 'Darwin') : if ( self.platform == 'Darwin' ) :
env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] ) env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] )
def CheckoutOrUpdate( self, svnurl, path ): def CheckoutOrUpdate( self, svnurl, path ):