remove old OSX bundle stuff
authorBradley Bell <btb@icculus.org>
Mon, 31 May 2004 08:20:44 +0000 (08:20 +0000)
committerBradley Bell <btb@icculus.org>
Mon, 31 May 2004 08:20:44 +0000 (08:20 +0000)
ChangeLog
Info.plist.in [deleted file]
Makefile.am
configure.ac

index ba32300..3599128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-31  Bradley Bell  <btb@icculus.org>
 
+       * Info.plist.in, Makefile.am, configure.ac: remove old OSX bundle
+       stuff
+
        * English.lproj/InfoPlist.strings, d2x-Info.plist,
        d2xgl-Info.plist, arch/cocoa/SDLMain.h, arch/cocoa/SDLMain.m,
        d2x.xcode/project.pbxproj: added XCode project files
diff --git a/Info.plist.in b/Info.plist.in
deleted file mode 100644 (file)
index a4b3e84..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>@TARGETS@</string>
-       <key>CFBundleGetInfoString</key>
-       <string>@VERSION@, Copyright 2003 Bradley Bell</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleName</key>
-       <string>@PACKAGE@</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleShortVersionString</key>
-       <string>@VERSION@</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>@VERSION@</string>
-       <key>NSMainNibFile</key>
-       <string>SDLMain.nib</string>
-       <key>NSPrincipalClass</key>
-       <string>NSApplication</string>
-       <key>NSHumanReadableCopyright</key>
-       <string>Copyright 2003 Bradley Bell</string>
-</dict>
-</plist>
index 1744115..08ac9ef 100644 (file)
@@ -4,14 +4,6 @@ SUBDIRS = ${DIST_SUBDIRS} @D2X_SUBDIRS@
 
 EXTRA_SUBDIRS = include unused debian rpm VisualC VisualCE
 
-if BUILD_MACOSX_BUNDLE
-bundle_contents = @PACKAGE@.app/Contents
-else
-if BUILD_SIMPLE_BUNDLE
-bundle_contents = @PACKAGE@
-endif
-endif
-
 bin_PROGRAMS = @TARGETS@
 
 EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga d2x-ggi
@@ -64,58 +56,6 @@ missiondir = ${pkgdatadir}/missions
 
 CLEANFILES = @TARGETS@ Info.plist
 
-if BUILD_MACOSX_BUNDLE
-
-@PACKAGE@_bundle: @TARGETS@
-       mkdir -p $(bundle_contents)/MacOS
-       echo "APPL????" > $(bundle_contents)/PkgInfo
-       $(INSTALL_DATA) Info.plist $(bundle_contents)
-       $(INSTALL_PROGRAM) @TARGETS@ $(bundle_contents)/MacOS/
-
-install-exec-hook: @PACKAGE@_bundle
-       rm -rf $(DESTDIR)$(prefix)/@PACKAGE@.app
-       mkdir -p $(DESTDIR)$(prefix)/
-       cp -r @PACKAGE@.app $(DESTDIR)$(prefix)/
-
-clean-local:
-       rm -rf $(bundle_contents)
-
-else
-
-if BUILD_SIMPLE_BUNDLE
-
-@PACKAGE@_bundle: @TARGETS@
-       $(INSTALL_PROGRAM) @TARGETS@ $(bundle_contents)/
-
-install-exec-hook: @PACKAGE@_bundle
-       rm -rf $(DESTDIR)/$(prefix)/@PACKAGE@
-       mkdir -p $(DESTDIR)/$(prefix)/
-       cp COPYING @PACKAGE@/COPYING.txt
-       cp COPYING.LIB @PACKAGE@/COPYING_LIB.txt
-       cp ChangeLog @PACKAGE@/ChangeLog.txt
-       cp TODO @PACKAGE@/TODO.txt
-       cp README @PACKAGE@/README.txt
-       cp README.jp @PACKAGE@/README_jp.txt
-       cp README.sfont @PACKAGE@/sfont.txt
-       cp README.xkobo @PACKAGE@/xkobo.txt
-       cp README.xkobo.jp @PACKAGE@/xkobo_jp.txt
-       cp 501 @PACKAGE@/scores/42
-       cp -r @PACKAGE@  $(DESTDIR)/$(prefix)/
-
-clean-local:
-       rm -rf $(bundle_contents)
-
-else
-@PACKAGE@_bundle:
-
-install-exec-hook:
-
-clean-local:
-
-endif
-
-endif
-
 EXTRA_DIST = ${EXTRA_SUBDIRS} \
 ChangeLog \
 README.utils \
index fadff96..84dcc30 100644 (file)
@@ -46,9 +46,6 @@ case $host_cpu in
        ;;
 esac
 
-build_macosx_bundle=no
-build_simple_bundle=no
-
 case $host_os in
     cygwin)
         AC_MSG_WARN([Cygwin found, setting -mno-cygwin])
@@ -60,13 +57,6 @@ case $host_os in
         ;;
     darwin*)
         MACOSX=yes
-       AC_MSG_RESULT(Mac OS X/Darwin; Mac OS X bundle)
-       build_macosx_bundle=yes
-       DATADIR='EXE>>../Resources'
-       #SCOREDIR='/Library/Preferences/KoboDeluxe/scores'
-       #CONFIGDIR='HOME>>Library/Preferences'
-       #CONFIGFILE='KoboDeluxe Preferences'
-       MATHLIB=""
        CFLAGS="-no-cpp-precomp $CFLAGS"
        ;;
     msdos*)
@@ -87,8 +77,6 @@ else
 fi
 
 AM_CONDITIONAL(MACOSX, test x$MACOSX = xyes)
-AM_CONDITIONAL(BUILD_MACOSX_BUNDLE, test x$build_macosx_bundle = xyes)
-AM_CONDITIONAL(BUILD_SIMPLE_BUNDLE, test x$build_simple_bundle = xyes)
 
 dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
 test "x$prefix" = "xNONE" && prefix=$ac_default_prefix
@@ -206,12 +194,12 @@ else
 
   # Check for libpng
        have_libpng=no
-       PKG_CHECK_MODULES(LIBPNG, libpng,
-               AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng])
-               have_libpng=yes
-               LIBS="$LIBPNG_LIBS $LIBS",
-               AC_MSG_WARN([libpng not found. disabling png replacement texture support])
-)
+       #PKG_CHECK_MODULES(LIBPNG, libpng,
+       #       AC_DEFINE(HAVE_LIBPNG,,[Define if you have libpng])
+       #       have_libpng=yes
+       #       LIBS="$LIBPNG_LIBS $LIBS",
+       #       AC_MSG_WARN([libpng not found. disabling png replacement texture support])
+#)
        AM_CONDITIONAL(USE_LIBPNG, test x$have_libpng = xyes)
 
   # Check for OpenGL
@@ -367,7 +355,7 @@ AH_BOTTOM([
 #define NEWDEMO 1
 
 #if defined(__APPLE__) && defined(__MACH__)
-#define __unix__
+#define __unix__ /* since we're doing a unix-style compilation... */
 #endif
 
 #ifdef __unix__
@@ -440,7 +428,6 @@ AC_OUTPUT(
     utilities/Makefile
     debian/changelog
     rpm/d2x.spec
-    Info.plist
 )
 
 AC_MSG_RESULT([