ref: afb95216afb043a56122a3f57292bf0ded5d7775
parent: 6921f30a44e0bdf1c3a2f8982e4a8cd290c22462
author: Simon Howard <[email protected]>
date: Mon Jan 4 17:11:11 EST 2010
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
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,8 @@
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
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -30,7 +30,7 @@
# Launcher build:
-CFLAGS=-Wall
+CFLAGS=-Wall -I../..
LDFLAGS=-framework Cocoa
LAUNCHER_OBJS= \
--- a/pkg/osx/Info.plist
+++ /dev/null
@@ -1,32 +1,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>
--- a/pkg/osx/config.h
+++ /dev/null
@@ -1,27 +1,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 "[email protected]"
-
-/* 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"
-
--- a/pkg/osx/config.make
+++ /dev/null
@@ -1,10 +1,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
-