mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 07:11:41 +00:00
Clean up the Forge source tree. Also, I'm starting to use ProjectCenter to
manage the makefile.
This commit is contained in:
parent
c1e3e1e9e7
commit
091e4f77b1
21 changed files with 243 additions and 38 deletions
BIN
tools/Forge/English.lproj/Forge.gorm
Normal file
BIN
tools/Forge/English.lproj/Forge.gorm
Normal file
Binary file not shown.
|
@ -14,7 +14,7 @@ void NopSound (void);
|
||||||
|
|
||||||
void qprintf (char *fmt, ...); // prints text to cmd_out_i
|
void qprintf (char *fmt, ...); // prints text to cmd_out_i
|
||||||
|
|
||||||
@interface QuakeEd: NSWindow
|
@interface Forge: NSWindow
|
||||||
{
|
{
|
||||||
BOOL dirty;
|
BOOL dirty;
|
||||||
char filename[1024]; // full path with .map extension
|
char filename[1024]; // full path with .map extension
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
|
|
||||||
#import "qedefs.h"
|
#import "qedefs.h"
|
||||||
|
|
||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
#import <AppKit/AppKit.h>
|
||||||
|
|
||||||
|
#import "Forge.h"
|
||||||
|
|
||||||
id quakeed_i;
|
id quakeed_i;
|
||||||
id entclasses_i;
|
id entclasses_i;
|
||||||
|
|
||||||
|
@ -26,7 +30,7 @@ char *leakcmd = "rsh satan \"/LocalApps/qbsp -mark -notjunc $1 $2\"";
|
||||||
|
|
||||||
void NopSound (void)
|
void NopSound (void)
|
||||||
{
|
{
|
||||||
NXBeep ();
|
NSBeep ();
|
||||||
}
|
}
|
||||||
|
|
||||||
UserPath *upath;
|
UserPath *upath;
|
||||||
|
@ -71,7 +75,7 @@ void DisplayCmdOutput (void)
|
||||||
|
|
||||||
[preferences_i playBspSound];
|
[preferences_i playBspSound];
|
||||||
|
|
||||||
NXPing ();
|
NSPing ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -96,7 +100,7 @@ void CheckCmdDone(DPSTimedEntry tag, double now, void *userData)
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
|
|
||||||
@implementation QuakeEd
|
@implementation Forge
|
||||||
|
|
||||||
/*
|
/*
|
||||||
===============
|
===============
|
||||||
|
|
12
tools/Forge/ForgeInfo.plist
Normal file
12
tools/Forge/ForgeInfo.plist
Normal 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 = "";
|
||||||
|
}
|
|
@ -1,52 +1,126 @@
|
||||||
include $(GNUSTEP_MAKEFILES)/common.make
|
#
|
||||||
|
# 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
|
||||||
|
#
|
||||||
|
|
||||||
OBJCFLAGS += -Wall
|
include $(GNUSTEP_MAKEFILES)/common.make
|
||||||
|
#
|
||||||
|
|
||||||
|
# Subprojects
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Main application
|
||||||
|
#
|
||||||
|
|
||||||
PACKAGE_NAME=Forge
|
PACKAGE_NAME=Forge
|
||||||
APP_NAME=Forge
|
APP_NAME=Forge
|
||||||
Forge_APPLICATION_ICON= Forge.tiff
|
Forge_APPLICATION_ICON=Images/Forge.tiff
|
||||||
|
#
|
||||||
|
|
||||||
|
# Additional libraries
|
||||||
|
#
|
||||||
|
|
||||||
|
ADDITIONAL_GUI_LIBS +=
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
||||||
# Resource files
|
# Resource files
|
||||||
#
|
#
|
||||||
Forge_LANGUAGES= English
|
|
||||||
# We don't have a .gorm file yet, but we will
|
Forge_RESOURCE_FILES= \
|
||||||
Forge_LOCALIZED_RESOURCE_FILES= Forge.gorm
|
English.lproj/Forge.gorm \
|
||||||
Forge_RESOURCE_FILES= DownArrow.tiff i_90d.tiff i_add.tiff i_brushes.tiff \
|
ForgeInfo.plist \
|
||||||
i_fliph.tiff i_flipv.tiff i_sub.tiff short.tiff \
|
Images/DownArrow.tiff \
|
||||||
tall.tiff UpArrow.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
|
# Header files
|
||||||
#
|
#
|
||||||
Forge_HEADERS= CameraView.h Clipper.h Entity.h EntityArray.h EntityClass.h \
|
|
||||||
Forge.h InspectorControl.h KeypairView.h Map.h PopScrollView.h \
|
Forge_HEADERS= \
|
||||||
Preferences.h Project.h SetBrush.h TexturePalette.h \
|
CameraView.h \
|
||||||
TextureView.h Things.h UserPath.h XYView.h ZScrollView.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 \
|
ZView.h \
|
||||||
render.h cmdlib.h mathlib.h
|
cmdlib.h \
|
||||||
|
mathlib.h \
|
||||||
|
qedefs.h \
|
||||||
|
render.h
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
||||||
# Class files
|
# Class files
|
||||||
#
|
#
|
||||||
Forge_OBJC_FILES= CameraView.m Clipper.m Entity.m EntityArray.m \
|
|
||||||
EntityClass.m Forge.m Forge_main.m InspectorControl.m \
|
Forge_OBJC_FILES= \
|
||||||
KeypairView.m Map.m PopScrollView.m Preferences.m \
|
CameraView.m \
|
||||||
Project.m SetBrush.m TexturePalette.m TextureView.m \
|
Clipper.m \
|
||||||
Things.m UserPath.m XYView.m ZScrollView.m ZView.m \
|
Entity.m \
|
||||||
misc.m render.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
|
# 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.preamble
|
||||||
|
-include GNUmakefile.local
|
||||||
|
include $(GNUSTEP_MAKEFILES)/aggregate.make
|
||||||
include $(GNUSTEP_MAKEFILES)/application.make
|
include $(GNUSTEP_MAKEFILES)/application.make
|
||||||
|
|
||||||
-include GNUmakefile.postamble
|
-include GNUmakefile.postamble
|
||||||
|
|
||||||
-include GNUmakefile.dependencies
|
|
||||||
|
|
115
tools/Forge/PC.project
Normal file
115
tools/Forge/PC.project
Normal 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
|
||||||
|
);
|
||||||
|
}
|
Loading…
Reference in a new issue