From 25f8a50ef456aa7338d535de6839ea80f7a4ff33 Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Tue, 27 Feb 2001 21:18:27 +0000 Subject: [PATCH] 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 | 177 ++++++++++--------- tools/Forge/GNUmakefile.preamble | 26 +++ tools/Forge/{ => Headers}/Brush.h | 0 tools/Forge/{ => Headers}/CameraView.h | 0 tools/Forge/{ => Headers}/Clipper.h | 0 tools/Forge/{ => Headers}/Dict.h | 0 tools/Forge/{ => Headers}/Entity.h | 0 tools/Forge/{ => Headers}/EntityArray.h | 0 tools/Forge/{ => Headers}/EntityClass.h | 0 tools/Forge/{ => Headers}/Forge.h | 0 tools/Forge/{ => Headers}/InspectorControl.h | 0 tools/Forge/{ => Headers}/KeypairView.h | 0 tools/Forge/{ => Headers}/Map.h | 0 tools/Forge/{ => Headers}/PopScrollView.h | 0 tools/Forge/{ => Headers}/Preferences.h | 0 tools/Forge/{ => Headers}/Project.h | 0 tools/Forge/{ => Headers}/SetBrush.h | 0 tools/Forge/{ => Headers}/TexturePalette.h | 0 tools/Forge/{ => Headers}/TextureView.h | 0 tools/Forge/{ => Headers}/Things.h | 0 tools/Forge/{ => Headers}/UserPath.h | 0 tools/Forge/{ => Headers}/XYView.h | 0 tools/Forge/{ => Headers}/ZScrollView.h | 0 tools/Forge/{ => Headers}/ZView.h | 0 tools/Forge/{ => Headers}/cmdlib.h | 0 tools/Forge/{ => Headers}/mathlib.h | 0 tools/Forge/{ => Headers}/qedefs.h | 0 tools/Forge/{ => Headers}/render.h | 0 tools/Forge/PC.project | 115 ------------ 29 files changed, 122 insertions(+), 196 deletions(-) create mode 100644 tools/Forge/GNUmakefile.preamble rename tools/Forge/{ => Headers}/Brush.h (100%) rename tools/Forge/{ => Headers}/CameraView.h (100%) rename tools/Forge/{ => Headers}/Clipper.h (100%) rename tools/Forge/{ => Headers}/Dict.h (100%) rename tools/Forge/{ => Headers}/Entity.h (100%) rename tools/Forge/{ => Headers}/EntityArray.h (100%) rename tools/Forge/{ => Headers}/EntityClass.h (100%) rename tools/Forge/{ => Headers}/Forge.h (100%) rename tools/Forge/{ => Headers}/InspectorControl.h (100%) rename tools/Forge/{ => Headers}/KeypairView.h (100%) rename tools/Forge/{ => Headers}/Map.h (100%) rename tools/Forge/{ => Headers}/PopScrollView.h (100%) rename tools/Forge/{ => Headers}/Preferences.h (100%) rename tools/Forge/{ => Headers}/Project.h (100%) rename tools/Forge/{ => Headers}/SetBrush.h (100%) rename tools/Forge/{ => Headers}/TexturePalette.h (100%) rename tools/Forge/{ => Headers}/TextureView.h (100%) rename tools/Forge/{ => Headers}/Things.h (100%) rename tools/Forge/{ => Headers}/UserPath.h (100%) rename tools/Forge/{ => Headers}/XYView.h (100%) rename tools/Forge/{ => Headers}/ZScrollView.h (100%) rename tools/Forge/{ => Headers}/ZView.h (100%) rename tools/Forge/{ => Headers}/cmdlib.h (100%) rename tools/Forge/{ => Headers}/mathlib.h (100%) rename tools/Forge/{ => Headers}/qedefs.h (100%) rename tools/Forge/{ => Headers}/render.h (100%) delete mode 100644 tools/Forge/PC.project diff --git a/tools/Forge/GNUmakefile b/tools/Forge/GNUmakefile index cb8b8c859..749dd77a9 100644 --- a/tools/Forge/GNUmakefile +++ b/tools/Forge/GNUmakefile @@ -1,126 +1,141 @@ # -# GNUmakefile - Generated by the ProjectCenter -# Written by Philippe C.D. Robert +# GNUmakefile # -# 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 -# GNUmakefile.postamble +# Copyright (C) 2001 Jeff Teunissen # +# 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 \ -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 + ForgeInfo.plist \ + Images/DownArrow.tiff \ + Images/i_90d.tiff \ + Images/i_add.tiff \ + Images/i_brushes.tiff \ + Images/i_fliph.tiff \ + Images/i_flipv.tiff \ + Images/i_sub.tiff \ + Images/short.tiff \ + Images/tall.tiff \ + Images/UpArrow.tiff # - # Header files # - Forge_HEADERS= \ -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 + Headers/CameraView.h \ + Headers/Clipper.h \ + Headers/Entity.h \ + Headers/EntityArray.h \ + Headers/EntityClass.h \ + Headers/Forge.h \ + Headers/InspectorControl.h \ + Headers/KeypairView.h \ + Headers/Map.h \ + Headers/PopScrollView.h \ + Headers/Preferences.h \ + Headers/Project.h \ + Headers/SetBrush.h \ + Headers/TexturePalette.h \ + Headers/TextureView.h \ + Headers/Things.h \ + Headers/UserPath.h \ + Headers/XYView.h \ + Headers/ZScrollView.h \ + Headers/ZView.h \ + Headers/cmdlib.h \ + Headers/mathlib.h \ + Headers/qedefs.h \ + Headers/render.h # - # Class files # - Forge_OBJC_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 + 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 \ + misc.m \ + render.m # - # C files # - Forge_C_FILES= \ -cmdlib.c \ -mathlib.c + cmdlib.c \ + mathlib.c -include GNUmakefile.preamble -include GNUmakefile.local + include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/application.make + -include GNUmakefile.postamble diff --git a/tools/Forge/GNUmakefile.preamble b/tools/Forge/GNUmakefile.preamble new file mode 100644 index 000000000..dd4612bd0 --- /dev/null +++ b/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 += diff --git a/tools/Forge/Brush.h b/tools/Forge/Headers/Brush.h similarity index 100% rename from tools/Forge/Brush.h rename to tools/Forge/Headers/Brush.h diff --git a/tools/Forge/CameraView.h b/tools/Forge/Headers/CameraView.h similarity index 100% rename from tools/Forge/CameraView.h rename to tools/Forge/Headers/CameraView.h diff --git a/tools/Forge/Clipper.h b/tools/Forge/Headers/Clipper.h similarity index 100% rename from tools/Forge/Clipper.h rename to tools/Forge/Headers/Clipper.h diff --git a/tools/Forge/Dict.h b/tools/Forge/Headers/Dict.h similarity index 100% rename from tools/Forge/Dict.h rename to tools/Forge/Headers/Dict.h diff --git a/tools/Forge/Entity.h b/tools/Forge/Headers/Entity.h similarity index 100% rename from tools/Forge/Entity.h rename to tools/Forge/Headers/Entity.h diff --git a/tools/Forge/EntityArray.h b/tools/Forge/Headers/EntityArray.h similarity index 100% rename from tools/Forge/EntityArray.h rename to tools/Forge/Headers/EntityArray.h diff --git a/tools/Forge/EntityClass.h b/tools/Forge/Headers/EntityClass.h similarity index 100% rename from tools/Forge/EntityClass.h rename to tools/Forge/Headers/EntityClass.h diff --git a/tools/Forge/Forge.h b/tools/Forge/Headers/Forge.h similarity index 100% rename from tools/Forge/Forge.h rename to tools/Forge/Headers/Forge.h diff --git a/tools/Forge/InspectorControl.h b/tools/Forge/Headers/InspectorControl.h similarity index 100% rename from tools/Forge/InspectorControl.h rename to tools/Forge/Headers/InspectorControl.h diff --git a/tools/Forge/KeypairView.h b/tools/Forge/Headers/KeypairView.h similarity index 100% rename from tools/Forge/KeypairView.h rename to tools/Forge/Headers/KeypairView.h diff --git a/tools/Forge/Map.h b/tools/Forge/Headers/Map.h similarity index 100% rename from tools/Forge/Map.h rename to tools/Forge/Headers/Map.h diff --git a/tools/Forge/PopScrollView.h b/tools/Forge/Headers/PopScrollView.h similarity index 100% rename from tools/Forge/PopScrollView.h rename to tools/Forge/Headers/PopScrollView.h diff --git a/tools/Forge/Preferences.h b/tools/Forge/Headers/Preferences.h similarity index 100% rename from tools/Forge/Preferences.h rename to tools/Forge/Headers/Preferences.h diff --git a/tools/Forge/Project.h b/tools/Forge/Headers/Project.h similarity index 100% rename from tools/Forge/Project.h rename to tools/Forge/Headers/Project.h diff --git a/tools/Forge/SetBrush.h b/tools/Forge/Headers/SetBrush.h similarity index 100% rename from tools/Forge/SetBrush.h rename to tools/Forge/Headers/SetBrush.h diff --git a/tools/Forge/TexturePalette.h b/tools/Forge/Headers/TexturePalette.h similarity index 100% rename from tools/Forge/TexturePalette.h rename to tools/Forge/Headers/TexturePalette.h diff --git a/tools/Forge/TextureView.h b/tools/Forge/Headers/TextureView.h similarity index 100% rename from tools/Forge/TextureView.h rename to tools/Forge/Headers/TextureView.h diff --git a/tools/Forge/Things.h b/tools/Forge/Headers/Things.h similarity index 100% rename from tools/Forge/Things.h rename to tools/Forge/Headers/Things.h diff --git a/tools/Forge/UserPath.h b/tools/Forge/Headers/UserPath.h similarity index 100% rename from tools/Forge/UserPath.h rename to tools/Forge/Headers/UserPath.h diff --git a/tools/Forge/XYView.h b/tools/Forge/Headers/XYView.h similarity index 100% rename from tools/Forge/XYView.h rename to tools/Forge/Headers/XYView.h diff --git a/tools/Forge/ZScrollView.h b/tools/Forge/Headers/ZScrollView.h similarity index 100% rename from tools/Forge/ZScrollView.h rename to tools/Forge/Headers/ZScrollView.h diff --git a/tools/Forge/ZView.h b/tools/Forge/Headers/ZView.h similarity index 100% rename from tools/Forge/ZView.h rename to tools/Forge/Headers/ZView.h diff --git a/tools/Forge/cmdlib.h b/tools/Forge/Headers/cmdlib.h similarity index 100% rename from tools/Forge/cmdlib.h rename to tools/Forge/Headers/cmdlib.h diff --git a/tools/Forge/mathlib.h b/tools/Forge/Headers/mathlib.h similarity index 100% rename from tools/Forge/mathlib.h rename to tools/Forge/Headers/mathlib.h diff --git a/tools/Forge/qedefs.h b/tools/Forge/Headers/qedefs.h similarity index 100% rename from tools/Forge/qedefs.h rename to tools/Forge/Headers/qedefs.h diff --git a/tools/Forge/render.h b/tools/Forge/Headers/render.h similarity index 100% rename from tools/Forge/render.h rename to tools/Forge/Headers/render.h diff --git a/tools/Forge/PC.project b/tools/Forge/PC.project deleted file mode 100644 index 06a2802a2..000000000 --- a/tools/Forge/PC.project +++ /dev/null @@ -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 "; - PROJECT_DESCRIPTION = "QuakeForge Map Editor"; - PROJECT_MAINTAINER = "Jeff Teunissen , Bill Currie "; - PROJECT_NAME = Forge; - PROJECT_TYPE = PCAppProject; - PROJECT_VERSION = 1.0; - SUBPROJECTS = ( - ); - SUPPORTING_FILES = ( - GNUmakefile.preamble, - GNUmakefile, - GNUmakefile.postamble - ); -}