Clean up the Forge source tree. Also, I'm starting to use ProjectCenter to

manage the makefile.
This commit is contained in:
Jeff Teunissen 2001-02-10 20:07:39 +00:00
parent c1e3e1e9e7
commit 091e4f77b1
21 changed files with 243 additions and 38 deletions

Binary file not shown.

View File

@ -1,10 +1,10 @@
extern id quakeed_i;
extern id quakeed_i;
extern BOOL filter_light, filter_path, filter_entities;
extern BOOL filter_clip_brushes, filter_water_brushes, filter_world;
extern BOOL filter_light, filter_path, filter_entities;
extern BOOL filter_clip_brushes, filter_water_brushes, filter_world;
extern UserPath *upath;
extern UserPath *upath;
extern id g_cmd_out_i;
@ -14,7 +14,7 @@ void NopSound (void);
void qprintf (char *fmt, ...); // prints text to cmd_out_i
@interface QuakeEd: NSWindow
@interface Forge: NSWindow
{
BOOL dirty;
char filename[1024]; // full path with .map extension

View File

@ -1,6 +1,10 @@
#import "qedefs.h"
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
#import "Forge.h"
id quakeed_i;
id entclasses_i;
@ -26,7 +30,7 @@ char *leakcmd = "rsh satan \"/LocalApps/qbsp -mark -notjunc $1 $2\"";
void NopSound (void)
{
NXBeep ();
NSBeep ();
}
UserPath *upath;
@ -71,7 +75,7 @@ void DisplayCmdOutput (void)
[preferences_i playBspSound];
NXPing ();
NSPing ();
}
/*
@ -96,7 +100,7 @@ void CheckCmdDone(DPSTimedEntry tag, double now, void *userData)
//============================================================================
@implementation QuakeEd
@implementation Forge
/*
===============

View File

@ -0,0 +1,12 @@
{
ApplicationDescription = "A map editor for QuakeForge";
ApplicationIcon = "Images/Forge.tiff";
ApplicationName = Forge;
ApplicationRelease = 0.1;
Authors = "Jeff Teunissen and Bill Currie";
Copyright = "Copyright (C) 2001 Jeff Teunissen <deek@quakeforge.net>, Bill Currie <taniwha@quakeforge.net>";
CopyrightDescription = "Released under the GNU General Public License";
FullVersionID = 0.1;
NOTE = "Automatically generated!";
URL = "";
}

View File

@ -1,52 +1,126 @@
#
# GNUmakefile - Generated by the ProjectCenter
# Written by Philippe C.D. Robert <phr@projectcenter.ch>
#
# NOTE: Do NOT change this file -- ProjectCenter maintains it!
#
# Put all of your customisations in GNUmakefile.preamble and
# GNUmakefile.postamble
#
include $(GNUSTEP_MAKEFILES)/common.make
#
OBJCFLAGS += -Wall
PACKAGE_NAME= Forge
APP_NAME= Forge
Forge_APPLICATION_ICON= Forge.tiff
# Subprojects
#
#
# Main application
#
PACKAGE_NAME=Forge
APP_NAME=Forge
Forge_APPLICATION_ICON=Images/Forge.tiff
#
# Additional libraries
#
ADDITIONAL_GUI_LIBS +=
#
# Resource files
#
Forge_LANGUAGES= English
# We don't have a .gorm file yet, but we will
Forge_LOCALIZED_RESOURCE_FILES= Forge.gorm
Forge_RESOURCE_FILES= DownArrow.tiff i_90d.tiff i_add.tiff i_brushes.tiff \
i_fliph.tiff i_flipv.tiff i_sub.tiff short.tiff \
tall.tiff UpArrow.tiff
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
#
# 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 \
render.h cmdlib.h mathlib.h
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
#
# 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 \
misc.m render.m
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
#
# C files
#
Forge_C_FILES= cmdlib.c mathlib.c
Forge_OTHER_SOURCES= GNUmakefile
Forge_C_FILES= \
cmdlib.c \
mathlib.c
-include GNUmakefile.preamble
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/application.make
-include GNUmakefile.postamble
-include GNUmakefile.dependencies

115
tools/Forge/PC.project Normal file
View File

@ -0,0 +1,115 @@
{
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
);
}