mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 06:10:56 +00:00
Nuking the configure stuff. There's no need for it yet, maybe not ever.
Add some flags (-Wall -Werror) to GNUmakefile.preamble. Fix some stuff -Wall found.
This commit is contained in:
Jeff Teunissen
parent
0060c9cc91
commit
acddb949e3
8 changed files with 19 additions and 94 deletions
9
tools/Forge/.gitignore
vendored
9
tools/Forge/.gitignore
vendored
|
|
@ -1,17 +1,12 @@
|
|||
.vimrc
|
||||
ChangeLog
|
||||
Config.h*
|
||||
Forge.app
|
||||
Forge.debug
|
||||
Forge.profile
|
||||
GNUmakefile.preamble
|
||||
aclocal.m4
|
||||
build-stamp
|
||||
config.cache
|
||||
config.log
|
||||
config.status
|
||||
configure
|
||||
configure-stamp
|
||||
shared_debug_obj
|
||||
shared_obj
|
||||
shared_profile_debug_obj
|
||||
shared_profile_obj
|
||||
*_obj
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ static const char rcsid[] =
|
|||
#import <Foundation/NSDebug.h>
|
||||
#import <Foundation/NSFileManager.h>
|
||||
#import <Foundation/NSPathUtilities.h>
|
||||
#import <AppKit/NSPanel.h>
|
||||
|
||||
#import "BundleController.h"
|
||||
|
||||
@interface BundleController (Private)
|
||||
|
|
@ -84,10 +86,10 @@ static const char rcsid[] =
|
|||
|
||||
// ensure path exists, and is a directory
|
||||
if (![fm fileExistsAtPath: path isDirectory: &isDir])
|
||||
return;
|
||||
return nil;
|
||||
|
||||
if (!isDir)
|
||||
return;
|
||||
return nil;
|
||||
|
||||
// scan for bundles matching the extension in the dir
|
||||
enumerator = [[fm directoryContentsAtPath: path] objectEnumerator];
|
||||
|
|
@ -95,6 +97,7 @@ static const char rcsid[] =
|
|||
if ([[dir pathExtension] isEqualToString: extension])
|
||||
[bundleList addObject: dir];
|
||||
}
|
||||
return bundleList;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@ static const char rcsid[] =
|
|||
|
||||
@implementation Controller
|
||||
|
||||
static PrefsController *prefsController = nil;
|
||||
|
||||
- (BOOL) application: (NSApplication *) app openFile: (NSString *) filename;
|
||||
{
|
||||
return NO;
|
||||
|
|
@ -137,8 +135,8 @@ static PrefsController *prefsController = nil;
|
|||
NSMenu *project;
|
||||
NSMenu *file;
|
||||
NSMenu *edit;
|
||||
NSMenu *bsp;
|
||||
NSMenu *brush;
|
||||
// NSMenu *bsp;
|
||||
// NSMenu *brush;
|
||||
NSMenu *windows;
|
||||
NSMenu *services;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
# Main makefile for the Forge Quake Editor
|
||||
#
|
||||
# Copyright (C) 2001 Jeff Teunissen <deek@dusknet.dhs.org>
|
||||
# Copyright (C) 2001 Jeff Teunissen <deek@d2dc.net>
|
||||
#
|
||||
# This Makefile is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
|
|
@ -67,6 +67,7 @@ Forge_LANGUAGES= \
|
|||
# Header files
|
||||
#
|
||||
Forge_HEADERS= \
|
||||
Config.h \
|
||||
BundleController.h \
|
||||
Controller.h \
|
||||
Preferences.h \
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
ADDITIONAL_CPPFLAGS +=
|
||||
|
||||
# Additional flags to pass to the Objective-C compiler
|
||||
ADDITIONAL_OBJCFLAGS += -g @CFLAGS@
|
||||
ADDITIONAL_OBJCFLAGS += -Wall -Werror
|
||||
|
||||
# Additional flags to pass to the C compiler
|
||||
ADDITIONAL_CFLAGS += -g @CFLAGS@
|
||||
ADDITIONAL_CFLAGS += -Wall -Werror
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS += -I ./Headers
|
||||
ADDITIONAL_INCLUDE_DIRS +=
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
ADDITIONAL_LDFLAGS +=
|
||||
|
|
@ -36,4 +36,7 @@ ADDITIONAL_WO_LIBS +=
|
|||
#
|
||||
|
||||
# Additional directories to be created during installation
|
||||
ADDITIONAL_INSTALL_DIRS +=
|
||||
ADDITIONAL_INSTALL_DIRS += \
|
||||
$(GNUSTEP_LOCAL_DIR)/Library/Forge \
|
||||
$(GNUSTEP_NETWORK_DIR)/Library/Forge \
|
||||
$(GNUSTEP_SYSTEM_DIR)/Library/Forge
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
/* Headers/Config.h. Generated automatically by configure. */
|
||||
/* Headers/Config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#!/bin/sh
|
||||
aclocal && autoheader && autoconf
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.13)
|
||||
AC_INIT(Forge_main.m)
|
||||
AC_CONFIG_HEADER(Headers/Config.h)
|
||||
AC_REVISION($Revision$) dnl
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
||||
AC_DEFINE(PACKAGE, "Forge")
|
||||
AC_DEFINE(VERSION, "0.1.0")
|
||||
|
||||
AC_SUBST(VERSION)
|
||||
|
||||
ISODATE=$(date +%Y-%m-%d)
|
||||
AC_SUBST(ISODATE)
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
|
||||
AC_LANG_C
|
||||
|
||||
dnl We want warnings, lots of warnings...
|
||||
if test "x$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -Wall -Werror -Wno-comment"
|
||||
# CFLAGS="$CFLAGS -Wall -pedantic"
|
||||
fi
|
||||
|
||||
dnl Checks for libraries.
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS(unistd.h)
|
||||
|
||||
dnl Checks for library functions.
|
||||
|
||||
AC_CHECK_HEADER(QF/qtypes.h, HAVE_QF=yes, HAVE_QF=no)
|
||||
if test "$HAVE_QF" = yes; then
|
||||
AC_CHECK_LIB(QFutil, Qopen,
|
||||
HAVE_QF=yes, HAVE_QF=no,
|
||||
[]
|
||||
)
|
||||
fi
|
||||
|
||||
if test "$HAVE_QF" != yes; then
|
||||
echo '***'
|
||||
echo '*** You seem to not have the QuakeForge libs & headers installed'
|
||||
echo '***'
|
||||
exit 1
|
||||
fi
|
||||
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(LDFLAGS)
|
||||
|
||||
AC_OUTPUT(
|
||||
GNUmakefile.preamble
|
||||
)
|
||||
Loading…
Reference in a new issue