mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
macosx update
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/freeze_1_8_0@17659 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
9aec07025d
commit
241e585533
3 changed files with 45 additions and 198 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2003-09-11 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* macosx/preface.h: Removed
|
||||
* macosx/GNUstepBase/preface.h: New
|
||||
* macosx/gnustep.pbproj/project.pbxproj: Update
|
||||
(from Philip Moetteli <philip.moetteli@tele2.ch>).
|
||||
|
||||
2003-09-11 Philip Moetteli <philip.moetteli@tele2.ch>
|
||||
|
||||
* Source/Additions/GSCompatibility.h
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
};
|
||||
034768E0FF38A50411DB9C8B = {
|
||||
isa = PBXFrameworkReference;
|
||||
path = gnustep.framework;
|
||||
path = GNUstepBase.framework;
|
||||
refType = 3;
|
||||
};
|
||||
//030
|
||||
|
|
@ -124,13 +124,14 @@
|
|||
DYLIB_CURRENT_VERSION = 1;
|
||||
FRAMEWORK_SEARCH_PATHS = "";
|
||||
FRAMEWORK_VERSION = A;
|
||||
HEADER_SEARCH_PATHS = "\"${SOURCE_ROOT}/../Headers/gnustep\" \"${SOURCE_ROOT}/../Headers\" /usr/local/include/libxml2 /sw/include";
|
||||
HEADER_SEARCH_PATHS = ". \"${SRCROOT}/../Headers/Additions\" /sw/include /sw/include/libxml2";
|
||||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
|
||||
LIBRARY_SEARCH_PATHS = "/usr/local/lib /sw/lib";
|
||||
OPTIMIZATION_CFLAGS = "-O0";
|
||||
OTHER_LDFLAGS = "-seg1addr 0x58000000 -headerpad_max_install_names";
|
||||
PRECOMPILE_PREFIX_HEADER = YES;
|
||||
PREFIX_HEADER = config.h;
|
||||
PRODUCT_NAME = gnustep;
|
||||
PRODUCT_NAME = GNUstepBase;
|
||||
SECTORDER_FLAGS = "";
|
||||
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
|
||||
WRAPPER_EXTENSION = framework;
|
||||
|
|
@ -149,7 +150,7 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>gnustep</string>
|
||||
<string>GNUstepBase</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string></string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
|
@ -201,7 +202,6 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
089C1668FE841158C02AAC07,
|
||||
554DDE86043110AA00000001,
|
||||
);
|
||||
isa = PBXResourcesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -287,11 +287,13 @@
|
|||
55CF466703E367A500000001,
|
||||
55CF466803E367A500000001,
|
||||
55CF466903E367A500000001,
|
||||
EFF20035050D035500A80103,
|
||||
55CF466A03E367A500000001,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Classes;
|
||||
refType = 4;
|
||||
name = Source;
|
||||
path = ../Source;
|
||||
refType = 2;
|
||||
};
|
||||
//080
|
||||
//081
|
||||
|
|
@ -456,28 +458,15 @@
|
|||
path = HTMLLinker.html;
|
||||
refType = 4;
|
||||
};
|
||||
554DDE86043110AA00000001 = {
|
||||
fileRef = 554DDE85043110AA00000001;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
554DDE87043110C200000001 = {
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = English.lproj/Documentation;
|
||||
dstSubfolderSpec = 7;
|
||||
files = (
|
||||
554DDE88043110E600000001,
|
||||
);
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
554DDE88043110E600000001 = {
|
||||
fileRef = 554DDE85043110AA00000001;
|
||||
isa = PBXBuildFile;
|
||||
settings = {
|
||||
};
|
||||
};
|
||||
554DDE890431135200000001 = {
|
||||
fileRef = 0867D69BFE84028FC02AAC07;
|
||||
isa = PBXBuildFile;
|
||||
|
|
@ -547,8 +536,9 @@
|
|||
55F7D7DF03E49C1000000001,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = Docs;
|
||||
refType = 4;
|
||||
name = Documentation;
|
||||
path = ../Documentation;
|
||||
refType = 2;
|
||||
};
|
||||
556FFD1903EC2ECE00000001 = {
|
||||
children = (
|
||||
|
|
@ -564,8 +554,8 @@
|
|||
);
|
||||
isa = PBXGroup;
|
||||
name = unicode;
|
||||
path = ../Headers/gnustep/unicode;
|
||||
refType = 2;
|
||||
path = Additions/GNUstepBase/unicode;
|
||||
refType = 4;
|
||||
};
|
||||
556FFD1A03EC2ECE00000001 = {
|
||||
fileEncoding = 30;
|
||||
|
|
@ -698,9 +688,9 @@
|
|||
555112B303FEC81600000001,
|
||||
);
|
||||
isa = PBXGroup;
|
||||
name = base;
|
||||
path = ../Headers/gnustep/base;
|
||||
refType = 2;
|
||||
name = GNUstepBase;
|
||||
path = Additions/GNUstepBase;
|
||||
refType = 4;
|
||||
};
|
||||
556FFD3103EC36E500000001 = {
|
||||
fileEncoding = 30;
|
||||
|
|
@ -753,7 +743,8 @@
|
|||
556FFD8A03EC36E500000001 = {
|
||||
fileEncoding = 30;
|
||||
isa = PBXFileReference;
|
||||
path = preface.h;
|
||||
name = preface.h;
|
||||
path = GNUstepBase/preface.h;
|
||||
refType = 2;
|
||||
};
|
||||
556FFD8B03EC36E500000001 = {
|
||||
|
|
@ -865,12 +856,13 @@
|
|||
);
|
||||
isa = PBXGroup;
|
||||
name = Headers;
|
||||
refType = 4;
|
||||
path = ../Headers;
|
||||
refType = 2;
|
||||
};
|
||||
559CDB7E040587E100000001 = {
|
||||
isa = PBXFileReference;
|
||||
name = libxml2.a;
|
||||
path = /usr/local/lib/libxml2.a;
|
||||
path = /sw/lib/libxml2.a;
|
||||
refType = 0;
|
||||
};
|
||||
559CDB8004058ACF00000001 = {
|
||||
|
|
@ -1558,6 +1550,22 @@
|
|||
settings = {
|
||||
};
|
||||
};
|
||||
//550
|
||||
//551
|
||||
//552
|
||||
//553
|
||||
//554
|
||||
//EF0
|
||||
//EF1
|
||||
//EF2
|
||||
//EF3
|
||||
//EF4
|
||||
EFF20035050D035500A80103 = {
|
||||
fileEncoding = 30;
|
||||
isa = PBXFileReference;
|
||||
path = NSDecimal.m;
|
||||
refType = 4;
|
||||
};
|
||||
};
|
||||
rootObject = 0867D690FE84028FC02AAC07;
|
||||
}
|
||||
|
|
|
|||
168
macosx/preface.h
168
macosx/preface.h
|
|
@ -1,168 +0,0 @@
|
|||
/* General purpose definitions for the GNU Objective-C Library.
|
||||
Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
|
||||
Created: May 1993
|
||||
|
||||
This file is part of the GNUstep Base Library.
|
||||
|
||||
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; if not, write to the Free
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
|
||||
*/
|
||||
|
||||
#ifndef __preface_h_OBJECTS_INCLUDE
|
||||
#define __preface_h_OBJECTS_INCLUDE
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <gnustep/base/objc-gnu2next.h>
|
||||
|
||||
#if defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
|
||||
#ifndef __WIN32__
|
||||
#define __WIN32__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __MINGW32__
|
||||
#ifndef __MINGW__
|
||||
#define __MINGW__
|
||||
#endif
|
||||
#ifndef __WIN32__
|
||||
#define __WIN32__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#include <windows.h>
|
||||
#define GNUSTEP_BASE_SOCKET_MESSAGE (WM_USER + 1)
|
||||
#endif
|
||||
|
||||
#if NeXT_RUNTIME
|
||||
#include <objc/objc.h>
|
||||
#include <objc/objc-class.h>
|
||||
#include <objc/objc-runtime.h>
|
||||
#ifndef _C_ATOM
|
||||
#define _C_ATOM '%'
|
||||
#endif
|
||||
#define _F_CONST 0x01
|
||||
#define _F_IN 0x01
|
||||
#define _F_OUT 0x02
|
||||
#define _F_INOUT 0x03
|
||||
#define _F_BYCOPY 0x04
|
||||
#define _F_ONEWAY 0x08
|
||||
#define _C_CONST 'r'
|
||||
#define _C_IN 'n'
|
||||
#define _C_INOUT 'N'
|
||||
#define _C_OUT 'o'
|
||||
#define _C_BYCOPY 'O'
|
||||
#define _C_ONEWAY 'V'
|
||||
#else /* GNU Objective C Runtime */
|
||||
#include <objc/objc.h>
|
||||
#include <objc/objc-api.h>
|
||||
#include <objc/encoding.h>
|
||||
#include <objc/sarray.h>
|
||||
/* #include <objc/objc-list.h> */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Hack for older compiler versions that don't have all defines
|
||||
* needed in objc-api.h
|
||||
*/
|
||||
#ifndef _C_LNG_LNG
|
||||
#define _C_LNG_LNG 'q'
|
||||
#endif
|
||||
#ifndef _C_ULNG_LNG
|
||||
#define _C_ULNG_LNG 'Q'
|
||||
#endif
|
||||
|
||||
#ifndef __WIN32__
|
||||
#include <sys/param.h> /* Hack to get rid of warning in GNU libc 2.0.3. */
|
||||
#endif
|
||||
|
||||
/* The following group of lines maintained by the gstep-base configure */
|
||||
#define GNUSTEP_BASE_VERSION @VERSION@
|
||||
#define GNUSTEP_BASE_MAJOR_VERSION 1
|
||||
#define GNUSTEP_BASE_MINOR_VERSION 6
|
||||
#define GNUSTEP_BASE_SUBMINOR_VERSION 0
|
||||
#define GNUSTEP_BASE_GCC_VERSION @GCC_VERSION@
|
||||
|
||||
#if 0
|
||||
extern const char o_version[];
|
||||
extern const char o_gcc_version[];
|
||||
#if NeXT_cc
|
||||
extern const char o_NeXT_cc_version[];
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define OBJC_MALLOC(VAR, TYPE, NUM) \
|
||||
((VAR) = (TYPE *) objc_malloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_VALLOC(VAR, TYPE, NUM) \
|
||||
((VAR) = (TYPE *) objc_valloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_ATOMIC_MALLOC(VAR, TYPE, NUM) \
|
||||
((VAR) = (TYPE *) objc_atomic_malloc ((unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_REALLOC(VAR, TYPE, NUM) \
|
||||
((VAR) = (TYPE *) objc_realloc ((VAR), (unsigned)(NUM)*sizeof(TYPE)))
|
||||
#define OBJC_CALLOC(VAR, TYPE, NUM) \
|
||||
((VAR) = (TYPE *) objc_calloc ((unsigned)(NUM), sizeof(TYPE)))
|
||||
#define OBJC_FREE(PTR) objc_free (PTR)
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a,b) \
|
||||
({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b); \
|
||||
_MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
|
||||
#endif
|
||||
|
||||
#ifndef MIN
|
||||
#define MIN(a,b) \
|
||||
({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b); \
|
||||
_MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
|
||||
#endif
|
||||
|
||||
#ifndef ABS
|
||||
#define ABS(a) \
|
||||
({typeof(a) _ABS_a = (a); \
|
||||
_ABS_a < 0 ? -_ABS_a : _ABS_a; })
|
||||
#endif
|
||||
|
||||
#ifndef STRINGIFY
|
||||
#define STRINGIFY(s) XSTRINGIFY(s)
|
||||
#define XSTRINGIFY(s) #s
|
||||
#endif
|
||||
|
||||
#ifndef OBJC_STRINGIFY
|
||||
#define OBJC_STRINGIFY(s) OBJC_XSTRINGIFY(s)
|
||||
#define OBJC_XSTRINGIFY(s) @#s
|
||||
#endif
|
||||
|
||||
#ifndef PTR2LONG
|
||||
#define PTR2LONG(P) (((char*)(P))-(char*)0)
|
||||
#endif
|
||||
#ifndef LONG2PTR
|
||||
#define LONG2PTR(L) (((char*)0)+(L))
|
||||
#endif
|
||||
|
||||
#if VSPRINTF_RETURNS_LENGTH
|
||||
#define VSPRINTF_LENGTH(VSPF_CALL) (VSPF_CALL)
|
||||
#else
|
||||
#define VSPRINTF_LENGTH(VSPF_CALL) strlen((VSPF_CALL))
|
||||
#endif /* VSPRINTF_RETURNS_LENGTH */
|
||||
|
||||
#if VASPRINTF_RETURNS_LENGTH
|
||||
#define VASPRINTF_LENGTH(VASPF_CALL) (VASPF_CALL)
|
||||
#else
|
||||
#define VASPRINTF_LENGTH(VASPF_CALL) strlen((VASPF_CALL))
|
||||
#endif /* VSPRINTF_RETURNS_LENGTH */
|
||||
|
||||
|
||||
#endif /* __preface_h_OBJECTS_INCLUDE */
|
||||
Loading…
Reference in a new issue