Okay, that was stupid. ProjectCenter isn't good enough yet, so I'm back to

writing makefiles by hand.

Add a makefile preamble to set up our flags.

Compartmentalize all the headers into a Headers/ dir.

tools/Forge/GNUmakefile

@@ -1,126 +1,141 @@
 #
-# GNUmakefile - Generated by the ProjectCenter
+#	GNUmakefile
-# Written by Philippe C.D. Robert <phr@projectcenter.ch>
 #
-# NOTE: Do NOT change this file -- ProjectCenter maintains it!
+#	Main makefile for the Forge Quake Editor
 #
-# Put all of your customisations in GNUmakefile.preamble and
+#	Copyright (C) 2001 Jeff Teunissen <deek@dusknet.dhs.org>
-# GNUmakefile.postamble
 #
+#	This Makefile is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
 
 include $(GNUSTEP_MAKEFILES)/common.make
-#
 
+#
 # Subprojects
 #
 
 #
 # Main application
 #
+APP_NAME=		Forge
+Forge_PRINCIPAL_CLASS=	Forge
+Forge_APPLICATION_ICON=	Forge.tiff
 
-PACKAGE_NAME=Forge
-APP_NAME=Forge
-Forge_APPLICATION_ICON=Images/Forge.tiff
 #
-
 # Additional libraries
 #
-
 ADDITIONAL_GUI_LIBS += 
 
 #
-
 # Resource files
 #
 
+# Languages we're localized for
+Forge_LANGUAGES= \
+	English
+
+# We don't have a proper .gorm file yet, but we will
+Forge_LOCALIZED_RESOURCE_FILES=	\
+	Forge.gorm
+
 Forge_RESOURCE_FILES= \
-English.lproj/Forge.gorm \
+	ForgeInfo.plist \
-ForgeInfo.plist \
+	Images/DownArrow.tiff \
-Images/DownArrow.tiff \
+	Images/i_90d.tiff \
-Images/Forge.tiff \
+	Images/i_add.tiff \
-Images/UpArrow.tiff \
+	Images/i_brushes.tiff \
-Images/i_90d.tiff \
+	Images/i_fliph.tiff \
-Images/i_add.tiff \
+	Images/i_flipv.tiff \
-Images/i_brushes.tiff \
+	Images/i_sub.tiff \
-Images/i_fliph.tiff \
+	Images/short.tiff \
-Images/i_flipv.tiff \
+	Images/tall.tiff \
-Images/i_quakeed.tiff \
+	Images/UpArrow.tiff
-Images/i_sub.tiff \
-Images/inspectors.tiff \
-Images/mainwindow.tiff \
-Images/short.tiff \
-Images/tall.tiff 
 
 #
-
 # Header files
 #
-
 Forge_HEADERS= \
-CameraView.h \
+	Headers/CameraView.h \
-Clipper.h \
+	Headers/Clipper.h \
-Entity.h \
+	Headers/Entity.h \
-EntityArray.h \
+	Headers/EntityArray.h \
-EntityClass.h \
+	Headers/EntityClass.h \
-Forge.h \
+	Headers/Forge.h \
-InspectorControl.h \
+	Headers/InspectorControl.h \
-KeypairView.h \
+	Headers/KeypairView.h \
-Map.h \
+	Headers/Map.h \
-PopScrollView.h \
+	Headers/PopScrollView.h \
-Preferences.h \
+	Headers/Preferences.h \
-Project.h \
+	Headers/Project.h \
-SetBrush.h \
+	Headers/SetBrush.h \
-TexturePalette.h \
+	Headers/TexturePalette.h \
-TextureView.h \
+	Headers/TextureView.h \
-Things.h \
+	Headers/Things.h \
-UserPath.h \
+	Headers/UserPath.h \
-XYView.h \
+	Headers/XYView.h \
-ZScrollView.h \
+	Headers/ZScrollView.h \
-ZView.h \
+	Headers/ZView.h \
-cmdlib.h \
+	Headers/cmdlib.h \
-mathlib.h \
+	Headers/mathlib.h \
-qedefs.h \
+	Headers/qedefs.h \
-render.h 
+	Headers/render.h
 
 #
-
 # Class files
 #
-
 Forge_OBJC_FILES= \
-CameraView.m \
+	CameraView.m \
-Clipper.m \
+	Clipper.m \
-Entity.m \
+	Entity.m \
-EntityArray.m \
+	EntityArray.m \
-EntityClass.m \
+	EntityClass.m \
-Forge.m \
+	Forge.m \
-Forge_main.m \
+	Forge_main.m \
-InspectorControl.m \
+	InspectorControl.m \
-KeypairView.m \
+	KeypairView.m \
-Map.m \
+	Map.m \
-PopScrollView.m \
+	PopScrollView.m \
-Preferences.m \
+	Preferences.m \
-Project.m \
+	Project.m \
-SetBrush.m \
+	SetBrush.m \
-TexturePalette.m \
+	TexturePalette.m \
-TextureView.m \
+	TextureView.m \
-Things.m \
+	Things.m \
-UserPath.m \
+	UserPath.m \
-XYView.m \
+	XYView.m \
-ZScrollView.m \
+	ZScrollView.m \
-ZView.m 
+	ZView.m \
+	misc.m \
+	render.m
 
 #
-
 # C files
 #
-
 Forge_C_FILES= \
-cmdlib.c \
+	cmdlib.c \
-mathlib.c 
+	mathlib.c
 
 -include GNUmakefile.preamble
 -include GNUmakefile.local
+
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/application.make
+
 -include GNUmakefile.postamble

tools/Forge/GNUmakefile.preamble

@@ -0,0 +1,26 @@
+# Additional flags to pass to the preprocessor
+ADDITIONAL_CPPFLAGS += 
+
+# Additional flags to pass to the Objective-C compiler
+ADDITIONAL_OBJCFLAGS += -g -Wall
+
+# Additional flags to pass to the C compiler
+ADDITIONAL_CFLAGS += -g -Wall
+
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I ./Headers
+
+# Additional LDFLAGS to pass to the linker
+ADDITIONAL_LDFLAGS += 
+
+# Additional library directories the linker should search
+ADDITIONAL_LIB_DIRS +=
+
+ADDITIONAL_TOOL_LIBS +=
+
+#
+# Flags dealing with installing and uninstalling
+#
+
+# Additional directories to be created during installation
+ADDITIONAL_INSTALL_DIRS +=

tools/Forge/PC.project

@@ -1,115 +0,0 @@
-{
-    APPCLASS = NSApplication;
-    APPKIT = "GNUSTEP-GUI";
-    APPLICATIONICON = Images/Forge.tiff;
-    BUILDTOOL = gnumake;
-    CLASS_FILES = (
-	CameraView.m,
-	Clipper.m,
-	Entity.m,
-	EntityArray.m,
-	EntityClass.m,
-	Forge.m,
-	Forge_main.m,
-	InspectorControl.m,
-	KeypairView.m,
-	Map.m,
-	PopScrollView.m,
-	Preferences.m,
-	Project.m,
-	SetBrush.m,
-	TexturePalette.m,
-	TextureView.m,
-	Things.m,
-	UserPath.m,
-	XYView.m,
-	ZScrollView.m,
-	ZView.m
-    );
-    COMPILEROPTIONS = "";
-    CREATION_DATE = "";
-    DOCU_FILES = (
-	Documentation/help.txt
-    );
-    FOUNDATION = "GNUSTEP-BASE";
-    FRAMEWORKS = (
-    );
-    HEADER_FILES = (
-	CameraView.h,
-	Clipper.h,
-	Entity.h,
-	EntityArray.h,
-	EntityClass.h,
-	Forge.h,
-	InspectorControl.h,
-	KeypairView.h,
-	Map.h,
-	PopScrollView.h,
-	Preferences.h,
-	Project.h,
-	SetBrush.h,
-	TexturePalette.h,
-	TextureView.h,
-	Things.h,
-	UserPath.h,
-	XYView.h,
-	ZScrollView.h,
-	ZView.h,
-	cmdlib.h,
-	mathlib.h,
-	qedefs.h,
-	render.h
-    );
-    IMAGES = (
-	Images/DownArrow.tiff,
-	Images/Forge.tiff,
-	Images/UpArrow.tiff,
-	Images/i_90d.tiff,
-	Images/i_add.tiff,
-	Images/i_brushes.tiff,
-	Images/i_fliph.tiff,
-	Images/i_flipv.tiff,
-	Images/i_quakeed.tiff,
-	Images/i_sub.tiff,
-	Images/inspectors.tiff,
-	Images/mainwindow.tiff,
-	Images/short.tiff,
-	Images/tall.tiff
-    );
-    INSTALLDIR = "$(HOME)/Apps";
-    INTERFACES = (
-	English.lproj/Forge.gorm
-    );
-    LANGUAGE = English;
-    LAST_EDITING = "";
-    LIBRARIES = (
-	"gnustep-base",
-	"gnustep-gui"
-    );
-    MAININTERFACE = "";
-    MAKEFILEDIR = /System/Makefiles;
-    OTHER_FILES = (
-    );
-    OTHER_RESOURCES = (
-	ForgeInfo.plist
-    );
-    OTHER_SOURCES = (
-	cmdlib.c,
-	mathlib.c
-    );
-    PRINCIPAL_CLASS = Forge_main.m;
-    PROJECT_BUILDER = PCAppProj;
-    PROJECT_CREATOR = "Jeff Teunissen <deek@dusknet.dhs.org>";
-    PROJECT_DESCRIPTION = "QuakeForge Map Editor";
-    PROJECT_MAINTAINER = "Jeff Teunissen <deek@dusknet.dhs.org>, Bill Currie <bill@taniwha.org>";
-    PROJECT_NAME = Forge;
-    PROJECT_TYPE = PCAppProject;
-    PROJECT_VERSION = 1.0;
-    SUBPROJECTS = (
-    );
-    SUPPORTING_FILES = (
-	GNUmakefile.preamble,
-	GNUmakefile,
-	GNUmakefile.postamble
-    );
-}