commit afb95216afb043a56122a3f57292bf0ded5d7775
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Jan 4 22:11:11 2010 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Jan 4 22:11:11 2010 +0000
Generate Info.plist and config.make in configure and remove temporary
versions. Include config.h from top level.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1785
---
configure.in | 2 ++
pkg/osx/GNUmakefile | 2 +-
pkg/osx/Info.plist | 32 --------------------------------
pkg/osx/Info.plist.in | 0
pkg/osx/config.h | 27 ---------------------------
pkg/osx/config.make | 10 ----------
6 files changed, 3 insertions(+), 70 deletions(-)
diff --git a/configure.in b/configure.in
index 60610ea1..9e95c0f1 100644
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,8 @@ pcsound/Makefile
pkg/Makefile
pkg/wince/GNUmakefile
pkg/win32/GNUmakefile
+pkg/osx/config.make
+pkg/osx/Info.plist
src/resource.rc
src/doom-screensaver.desktop
setup/setup-res.rc
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 8d89ef50..cf9d1ffb 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -30,7 +30,7 @@ $(STAGING_DIR): launcher
# Launcher build:
-CFLAGS=-Wall
+CFLAGS=-Wall -I../..
LDFLAGS=-framework Cocoa
LAUNCHER_OBJS= \
diff --git a/pkg/osx/Info.plist b/pkg/osx/Info.plist
deleted file mode 100755
index fb2afc15..00000000
--- a/pkg/osx/Info.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<!-- This is a temporary Info.plist file that will be removed.
- It will eventually be generated by configure. -->
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleDisplayName</key>
- <string>Cocoa Doom</string>
- <key>CFBundleExecutable</key>
- <string>launcher</string>
- <key>CFBundleGetInfoString</key>
- <string>Cocoa Doom 1.2.1</string>
- <key>CFBundleIconFile</key>
- <string>app.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Cocoa Doom</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.2.1</string>
- <key>CFBundleVersion</key>
- <string>1.2.1</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
- <key>NSMainNibFile</key>
- <string>launcher</string>
-</dict>
-</plist>
diff --git a/pkg/osx/Info.plist.in b/pkg/osx/Info.plist.in
old mode 100755
new mode 100644
diff --git a/pkg/osx/config.h b/pkg/osx/config.h
deleted file mode 100644
index 77fbac58..00000000
--- a/pkg/osx/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Dummy config.h for developing launcher. Eventually, the launcher
-// will include the top-level config.h for the program.
-
-/* Name of package */
-#define PACKAGE "cocoa-doom"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "fraggle@gmail.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Cocoa Doom"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Cocoa Doom 1.2.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "cocoa-doom"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.1"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.2.1"
-
diff --git a/pkg/osx/config.make b/pkg/osx/config.make
deleted file mode 100644
index 49905c84..00000000
--- a/pkg/osx/config.make
+++ /dev/null
@@ -1,10 +0,0 @@
-# File included by the main makefile that contains details
-# about the package name. This will eventuall be generated
-# by configure.
-
-PACKAGE = cocoa-doom
-PACKAGE_NAME = Cocoa Doom
-PACKAGE_STRING = Cocoa Doom 1.2.1
-PACKAGE_TARNAME = cocoa-doom
-PACKAGE_VERSION = 1.2.1
-