mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Better configuration, gui will compile without DPS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2954 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
dc8d5a7b03
commit
18bffd34b0
8 changed files with 1568 additions and 5 deletions
|
|
@ -1,3 +1,12 @@
|
|||
Mon Aug 31 16:31:12 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* Headers/gnustep/gui/DPSOperators.h: Define enough stuff so that
|
||||
when we don't have DPS, gui will still compile.
|
||||
* configure.in, configure: New files.
|
||||
* Header/gnuste/gui/config.h.in: Likewise.
|
||||
* Source/GNUmakefile.postamble: Config config.h to proper target dir.
|
||||
* Source/GNUmakefile.preamble: Add config.h include dirs
|
||||
|
||||
Weds Sept 2 1998 Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
|
||||
* NSFileWrapper.m and NSFileWrapper.h added preliminary implementations
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ help is greatly appreciated. Send email to @email{scottc@@net-community.com}.
|
|||
|
||||
@itemize @bullet
|
||||
|
||||
@item Need an rtf parser [6 - Objective-C, RTF] (980820).
|
||||
|
||||
@item
|
||||
flipped views; should be really simple to implement, using a
|
||||
simple Postscript transformation (see how scalation and
|
||||
|
|
|
|||
|
|
@ -29,12 +29,60 @@
|
|||
#ifndef _GNUstep_H_DPSOperators
|
||||
#define _GNUstep_H_DPSOperators
|
||||
|
||||
#include "config.h"
|
||||
|
||||
// Use the DPSclient library if we have it
|
||||
// #ifdef HAVE_DPS_DPSCLIENT_H
|
||||
#ifdef HAVE_DPS_DPSCLIENT_H
|
||||
|
||||
#include <DPS/dpsclient.h>
|
||||
#include <DPS/psops.h>
|
||||
|
||||
// #endif /* HAVE_DPS_DPSCLIENT_H */
|
||||
#else
|
||||
|
||||
typedef void (*DPSTextProc)();
|
||||
typedef void (*DPSErrorProc)();
|
||||
|
||||
typedef enum {
|
||||
dps_ascii, dps_binObjSeq, dps_encodedTokens
|
||||
} DPSProgramEncoding;
|
||||
/* Defines the 3 possible encodings of PostScript language programs. */
|
||||
|
||||
typedef enum {
|
||||
dps_indexed, dps_strings
|
||||
} DPSNameEncoding;
|
||||
/* Defines the 2 possible encodings for user names in the
|
||||
dps_binObjSeq and dps_encodedTokens forms of PostScript language
|
||||
programs. */
|
||||
|
||||
typedef enum {
|
||||
dps_tBoolean,
|
||||
dps_tChar, dps_tUChar,
|
||||
dps_tFloat, dps_tDouble,
|
||||
dps_tShort, dps_tUShort,
|
||||
dps_tInt, dps_tUInt,
|
||||
dps_tLong, dps_tULong } DPSDefinedType;
|
||||
|
||||
typedef struct {
|
||||
unsigned char attributedType;
|
||||
unsigned char tag;
|
||||
unsigned short length;
|
||||
union {
|
||||
int integerVal;
|
||||
float realVal;
|
||||
int nameVal; /* offset or index */
|
||||
int booleanVal;
|
||||
int stringVal; /* offset */
|
||||
int arrayVal; /* offset */
|
||||
} val;
|
||||
} DPSBinObjRec, *DPSBinObj;
|
||||
|
||||
typedef struct {
|
||||
unsigned char tokenType;
|
||||
unsigned char nTopElements;
|
||||
unsigned short length;
|
||||
DPSBinObjRec objects[1];
|
||||
} DPSBinObjSeqRec, *DPSBinObjSeq;
|
||||
|
||||
#endif /* HAVE_DPS_DPSCLIENT_H */
|
||||
|
||||
#endif /* _GNUstep_H_DPSOperators */
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@
|
|||
#ifndef _GNUstep_H_config
|
||||
#define _GNUstep_H_config
|
||||
|
||||
/* Define this if the DPS client library exists */
|
||||
#undef HAVE_DPS_DPSCLIENT_H
|
||||
|
||||
#include <Foundation/NSGeometry.h>
|
||||
|
||||
/* Define NSDebugLog if not defined */
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
#
|
||||
|
||||
# Things to do before compiling
|
||||
# before-all::
|
||||
before-all:: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h
|
||||
|
||||
# Things to do after compiling
|
||||
# after-all::
|
||||
|
|
@ -73,4 +73,12 @@
|
|||
|
||||
#
|
||||
# GNUstep GUI Library specific targets
|
||||
|
||||
#
|
||||
#
|
||||
# The config.h file is specific to a target
|
||||
#
|
||||
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h: ../config.status
|
||||
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
|
||||
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \
|
||||
-mv ../config.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,8 @@ ADDITIONAL_OBJCFLAGS = -g -Wall
|
|||
ADDITIONAL_CFLAGS = -g
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers\
|
||||
-I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
ADDITIONAL_LDFLAGS =
|
||||
|
|
|
|||
77
configure.in
Normal file
77
configure.in
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
# configure.in for GNUstep GUI library
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#
|
||||
# Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Adam Fedor <fedor@gnu.org>
|
||||
#
|
||||
# This file is part of the GNUstep GUI X/DPS Backend.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library 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
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
|
||||
AC_INIT(Source/NSApplication.m)
|
||||
|
||||
AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_PATH_X
|
||||
|
||||
if test "$ac_x_includes" != ""; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
|
||||
fi
|
||||
if test -r $ac_x_includes/X11/DPS; then
|
||||
CPPFLAGS="$CPPFLAGS -I$ac_x_includes/X11"
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_cpu.sh; then
|
||||
transformed_host_cpu=`../make/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`../make/clean_cpu.sh $target_cpu`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -f ../make/clean_os.sh; then
|
||||
transformed_host_os=`../make/clean_os.sh $host_os`
|
||||
transformed_target_os=`../make/clean_os.sh $target_os`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_cv_file_output_directory=Source/$transformed_host_cpu/$transformed_host_os
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
# check for dpsNXargs.h below looks at the appropriate target includes
|
||||
ORIG_C_INCLUDE_PATH=${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
C_INCLUDE_PATH=${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os:${C_INCLUDE_PATH}
|
||||
export C_INCLUDE_PATH
|
||||
|
||||
# We care about this header file on the target not host system
|
||||
AC_HAVE_HEADERS(DPS/dpsclient.h)
|
||||
|
||||
# Restore back to the original
|
||||
C_INCLUDE_PATH=${ORIG_C_INCLUDE_PATH}
|
||||
|
||||
AC_OUTPUT()
|
||||
|
||||
|
||||
Loading…
Reference in a new issue