diff --git a/.cproject b/.cproject new file mode 100644 index 00000000..4a2a3989 --- /dev/null +++ b/.cproject @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index b1c030fc..bbcc964d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.[oda] +.settings +games install diff --git a/.project b/.project new file mode 100644 index 00000000..daa477fe --- /dev/null +++ b/.project @@ -0,0 +1,27 @@ + + + NetRadiant + + + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/Makefile b/Makefile index 51b3fa9f..a68f3c61 100644 --- a/Makefile +++ b/Makefile @@ -233,8 +233,6 @@ ifeq ($(OS),Darwin) # workaround: we have no "ldd" for OS X, so... LDD = OTOOL = otool - - INSTALLDIR := $(INSTALLDIR_BASE)/NetRadiant.app/Contents/MacOS/install else $(error Unsupported build OS: $(OS)) @@ -1053,7 +1051,6 @@ $(INSTALLDIR)/heretic2/h2data.$(EXE): \ install-data: binaries $(MKDIR) $(INSTALLDIR)/games $(FIND) $(INSTALLDIR_BASE)/ -name .svn -exec $(RM_R) {} \; -prune - [ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/ DOWNLOAD_GAMEPACKS="$(DOWNLOAD_GAMEPACKS)" GIT="$(GIT)" SVN="$(SVN)" WGET="$(WGET)" RM_R="$(RM_R)" MV="$(MV)" UNZIPPER="$(UNZIPPER)" ECHO="$(ECHO)" SH="$(SH)" CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepacks.sh "$(INSTALLDIR)" $(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR $(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR @@ -1067,14 +1064,9 @@ ifeq ($(OS),Win32) install-dll: binaries MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) else -ifeq ($(OS),Darwin) -install-dll: binaries - EXE="$(EXE)" MACLIBDIR="$(MACLIBDIR)" CP="$(CP)" OTOOL="$(OTOOL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dylibs.sh -else install-dll: binaries @$(ECHO) No DLL inclusion implemented for this target. endif -endif # release building... NOT for general users # these may use tools not in the list that is checked by the build system diff --git a/download-gamepacks.sh b/download-gamepacks.sh index ff5b9840..1988972b 100755 --- a/download-gamepacks.sh +++ b/download-gamepacks.sh @@ -153,7 +153,7 @@ pack OpenArenaPack unknown zip1 http://ingar.satgnu.net/files/gtkradiant pack OsirionPack GPL zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/OsirionPack.zip pack Q3Pack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/ -r29 pack Quake2Pack proprietary zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake2Pack.zip -pack Quake2WorldPack GPL svn svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant +pack Quake2WorldPack GPL svn svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/branches/1.5/ pack QuakePack GPL zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/Quake1Pack.zip pack TremulousPack proprietary zip1 http://ingar.satgnu.net/files/gtkradiant/gamepacks/TremulousPack.zip pack UFOAIPack proprietary svn svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/ diff --git a/libs/shaderlib.h b/libs/shaderlib.h index ee972437..c4e5ba3b 100644 --- a/libs/shaderlib.h +++ b/libs/shaderlib.h @@ -50,6 +50,16 @@ bool operator()( const CopiedString& shader, const CopiedString& other ) const { } }; +static inline bool shader_is_diffuse( const char *shader ){ + return !string_equal_suffix( shader, "_bump" ) + && !string_equal_suffix( shader, "_glow" ) + && !string_equal_suffix( shader, "_h" ) + && !string_equal_suffix( shader, "_local" ) + && !string_equal_suffix( shader, "_luma" ) + && !string_equal_suffix( shader, "_nm" ) + && !string_equal_suffix( shader, "_s" ); +} + inline bool shader_valid( const char* shader ){ return string_is_ascii( shader ) && strchr( shader, ' ' ) == 0 @@ -57,7 +67,8 @@ inline bool shader_valid( const char* shader ){ && strchr( shader, '\r' ) == 0 && strchr( shader, '\t' ) == 0 && strchr( shader, '\v' ) == 0 - && strchr( shader, '\\' ) == 0; + && strchr( shader, '\\' ) == 0 + && shader_is_diffuse( shader ); } inline const char* GlobalTexturePrefix_get(){ diff --git a/libs/string/string.h b/libs/string/string.h index a6de0673..826d4a93 100644 --- a/libs/string/string.h +++ b/libs/string/string.h @@ -141,6 +141,13 @@ inline bool string_equal_prefix( const char* string, const char* prefix ){ return string_equal_n( string, prefix, string_length( prefix ) ); } +/// \brief Returns true if the ending of \p string is equal to \p suffix. +/// O(n) +inline bool string_equal_suffix( const char* string, const char* suffix){ + const char *s = string + string_length( string ) - string_length( suffix ); + return string_equal_n( s , suffix, string_length( suffix ) ); +} + /// \brief Copies \p other into \p string and returns \p string. /// Assumes that the space allocated for \p string is at least string_length(other) + 1. /// O(n) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index abb12ef6..a9c97072 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -200,6 +200,8 @@ void HomePaths_Realise(){ g_qeglobals.m_userEnginePath = path.c_str(); break; } + path.clear(); + path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/"; #endif #if defined( WIN32 ) @@ -3324,10 +3326,10 @@ void MainFrame_Construct(){ const char* ENGINEPATH_ATTRIBUTE = #if defined( WIN32 ) "enginepath_win32" -#elif defined( __linux__ ) || defined ( __FreeBSD__ ) - "enginepath_linux" #elif defined( __APPLE__ ) "enginepath_macos" +#elif defined( __linux__ ) || defined ( __FreeBSD__ ) + "enginepath_linux" #else #error "unknown platform" #endif diff --git a/setup/apple/.gitignore b/setup/apple/.gitignore new file mode 100644 index 00000000..e420ee4b --- /dev/null +++ b/setup/apple/.gitignore @@ -0,0 +1 @@ +target/* diff --git a/setup/apple/Makefile b/setup/apple/Makefile new file mode 100644 index 00000000..cf85d979 --- /dev/null +++ b/setup/apple/Makefile @@ -0,0 +1,83 @@ +# Makefile for NetRadiant.app, requires http://macdylibbundler.sourceforge.net/ + +INSTALL = ../../install +TARGET = target +RESOURCES = $(TARGET)/NetRadiant.app/Contents/Resources +BINDIR = $(RESOURCES)/install +CONFDIR = $(RESOURCES)/etc +DATADIR = $(RESOURCES)/share +LIBDIR = $(RESOURCES)/lib +VERSION = 1.5.0 +DMG = $(TARGET)/NetRadiant-$(VERSION).dmg +VOLUME_NAME = "NetRadiant $(VERSION)" + +# We must rewrite some Gtk configuration files, which vary from environment to +# environment depending on where you've installed MacPorts. Fun! + +MACPORTS_PREFIX := $(shell which port | sed 's:/bin/port::') +PREFIX_SED_EXPR = "s:$(MACPORTS_PREFIX):@executable_path/..:g" + +all: install bundle + +-pre-install: + install -d $(TARGET) + cp -r NetRadiant.app $(TARGET) + find $(TARGET) -name .turd -delete + +-gtk-runtime-gdk-pixbuf-2.0: + cp -r $(MACPORTS_PREFIX)/lib/gdk-pixbuf-2.0 $(LIBDIR) + find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete + + gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \ + $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders + +-gtk-runtime-pango: + cp -r $(MACPORTS_PREFIX)/lib/pango $(LIBDIR) + find $(LIBDIR)/pango -type f ! -name "*.so" -delete + + pango-querymodules | sed $(PREFIX_SED_EXPR) > \ + $(CONFDIR)/pango/pango.modules + +-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango + cp -r $(MACPORTS_PREFIX)/lib/gtk-2.0 $(LIBDIR) + find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete + + rm -rf $(LIBDIR)/gtk-2.0/{includes,modules} + rm -rf $(LIBDIR)/gtk-2.0/*/printbackends + + cp -r $(MACPORTS_PREFIX)/share/themes/Default $(RESOURCES)/share + + gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \ + $(CONFDIR)/gtk-2.0/gtk.immodules + +install: -pre-install -gtk-runtime + cp -r $(INSTALL) $(RESOURCES) + #rm -rf `find $(INSTDIR)/installs -type d -name .svn` + +bundle: + + # The Radiant plugins (modules) are a little funky + # Some of them are actually linked against the build directory + + test -L install || ln -s $(INSTALL) + + dylibbundler -b \ + -x $(BINDIR)/radiant \ + -x $(BINDIR)/q2map \ + -x $(BINDIR)/q3data \ + -x $(BINDIR)/q3map2 \ + -x $(BINDIR)/qdata3 \ + `find $(BINDIR)/modules -name "*.dylib" | xargs -I {} echo -x {}` \ + `find $(LIBDIR) -name "*.dylib" | xargs -I {} echo -x {}` \ + -d $(LIBDIR) -of -p @executable_path/../lib + + rm -f install + +image: + find $(TARGET) -name .DS_Store -delete + ln -f -s /Applications $(TARGET)/Applications + hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME) + rm $(TARGET)/Applications + +clean: + rm -rf $(TARGET)/* diff --git a/setup/apple/NetRadiant.app/Contents/Info.plist b/setup/apple/NetRadiant.app/Contents/Info.plist new file mode 100644 index 00000000..75796b16 --- /dev/null +++ b/setup/apple/NetRadiant.app/Contents/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDisplayName + NetRadiant + CFBundleExecutable + radiant + CFBundleIconFile + radiant.icns + CFBundleIdentifier + org.xonotic.netradiant + CFBundleName + NetRadiant + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.5.0 + CFBundleSignature + ???? + CFBundleVersion + 1.5.0 + LSMinimumSystemVersion + 10.7 + + diff --git a/setup/apple/NetRadiant.app/Contents/MacOS/radiant b/setup/apple/NetRadiant.app/Contents/MacOS/radiant new file mode 100755 index 00000000..701a7fec --- /dev/null +++ b/setup/apple/NetRadiant.app/Contents/MacOS/radiant @@ -0,0 +1,35 @@ +#!/bin/bash + +RADIANT_HOME=$(dirname "$0") +RADIANT_HOME=${RADIANT_HOME/NetRadiant.app*/NetRadiant.app} + +echo +echo "Starting NetRadiant in ${RADIANT_HOME}" +echo + +set -x + +resources="${RADIANT_HOME}/Contents/Resources" + +export FONTCONFIG_PATH="${resources}/etc/fonts" +export FC_DEBUG=1024 + +export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib" +export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib" + +export GDK_PATH="${resources}" +export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders" + +export GOBJECT_PATH="${resources}" + +export GTK_DATA_PREFIX="${resources}" +export GTK_EXE_PREFIX="${resources}" +export GTK_PATH="${resources}" + +export PANGO_SYSCONFDIR="${resources}/etc" +export PANGO_LIBDIR="${resources}/lib" + +cd "${resources}/install" +./radiant & + +set +x \ No newline at end of file diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf old mode 100755 new mode 100644 similarity index 77% rename from setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf rename to setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf index 86dc8af2..7183a4be --- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/fonts.conf +++ b/setup/apple/NetRadiant.app/Contents/Resources/etc/fonts/fonts.conf @@ -1,31 +1,19 @@ - - - - /usr/share/fonts - /usr/X11/lib/X11/fonts /Library/Fonts /Network/Library/Fonts /System/Library/Fonts /opt/local/share/fonts - ~/.fonts + + /usr/X11/lib/X11/fonts + /Library/Fonts + /System/Library/Fonts + fonts - conf.d - - - ~/.fontconfig + fontconfig - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders deleted file mode 100644 index f8852a26..00000000 --- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/gdk-pixbuf.loaders +++ /dev/null @@ -1,12 +0,0 @@ -# GdkPixbuf Image Loader Modules file -# Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gtk+-2.6.10 -# -# LoaderDir = /sw.haha/lib/gtk-2.0/2.4.0/loaders -# -"./libpixbufloader-bmp.so" -"bmp" 5 "gtk20" "The BMP image format" -"image/bmp" "image/x-bmp" "image/x-MS-bmp" "" -"bmp" "" -"BM" "" 100 - diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules deleted file mode 100644 index 9eecea48..00000000 --- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pango.modules +++ /dev/null @@ -1,7 +0,0 @@ -# Pango Modules file -# Automatically generated file, do not edit -# -# ModulesPath = /sw.haha/lib/pango/1.4.0/modules -# -./pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* common: -./pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc deleted file mode 100644 index 282e977e..00000000 --- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangorc +++ /dev/null @@ -1,5 +0,0 @@ -[Pango] -ModuleFiles = ./pango.modules - -[PangoX] -AliasFiles = ./pangox.aliases diff --git a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases b/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases deleted file mode 100644 index 9b41aa75..00000000 --- a/setup/data/osx/NetRadiant.app/Contents/MacOS/install/pangox.aliases +++ /dev/null @@ -1,220 +0,0 @@ -# File defining aliases of PangoFontDescription to X font set -# -# family style variant weight stretch XLFD - -sans normal normal normal normal \ - "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -sans italic normal normal normal \ - "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\ - -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -sans normal normal bold normal \ - "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\ - -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -sans italic normal bold normal \ - "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\ - -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - - -serif normal normal normal normal \ - "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -serif italic normal normal normal \ - "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\ - -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -serif normal normal bold normal \ - "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\ - -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -serif italic normal bold normal \ - "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\ - -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -monospace normal normal normal normal \ - "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -monospace italic normal normal normal \ - "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\ - -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -monospace normal normal bold normal \ - "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\ - -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" - -monospace italic normal bold normal \ - "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\ - -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\ - -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\ - -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\ - -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\ - -*-song ti-medium-r-normal--*-*-*-*-*-*-*-*,\ - -freetype-unitamil-medium-r-normal--*-*-*-*-*-*-iso10646-tam,\ - -*-devanagari-medium-r-normal--*-*-*-*-*-*-iso10646-dev,\ - -*-gujarati-medium-r-normal--*-*-*-*-*-*-iso10646-guj,\ - -*-gurmukhi-medium-r-normal--*-*-*-*-*-*-iso10646-gur,\ - -*-bengali-medium-r-normal--*-*-*-*-*-*-iso10646-bng,\ - -*-kannada-medium-r-normal--*-*-*-*-*-*-iso10646-kan,\ - -*-burmese-medium-r-normal--*-*-*-*-*-*-iso10646-brm,\ - -*-buginese-medium-r-normal--*-*-*-*-*-*-iso10646-bgn,\ - -*-oriya-medium-r-normal--*-*-*-*-*-*-iso10646-ori,\ - -daewoo-mincho-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0" diff --git a/setup/data/osx/NetRadiant.app/Contents/PkgInfo b/setup/data/osx/NetRadiant.app/Contents/PkgInfo deleted file mode 100644 index bd04210f..00000000 --- a/setup/data/osx/NetRadiant.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings b/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100755 index 4a182e50..00000000 Binary files a/setup/data/osx/NetRadiant.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ