gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make ICU and other libraries used by base available for gui etc. Also fix for windows build

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37409 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-11-25 08:54:08 +00:00
parent ce3811fd7a
commit 0441b09833
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,4 +1,14 @@
2013-11-222 Richard Frith-Macdonald <rfm@gnu.org>
2013-11-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GNUstepBase/GSConfig.h.in: temporarily redefine BOOL while
including windows headers, so we don't get conflict between windows
and objc booleans.
* base.make.in:
Add to CONFIG_SYSTEM_LIBS, CONFIG_SYSTEM_LIB_DIR, CONFIG_SYSTEM_INCL
So that the libraries/headers used to build base are available for
software using base.
2013-11-22 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSTLS.m:
Set errno to EAGAIN if TLS layer fails in a non-fatal way during

2
Headers/GNUstepBase/GSConfig.h.in
View file

@ -263,6 +263,7 @@ typedef struct {
#endif
#if defined(__WIN32__)
#define BOOL WinBOOL
#include <w32api.h>
#ifndef _WIN32_WINNT
#define _WIN32_WINNT Windows2000
@ -274,6 +275,7 @@ typedef struct {
#define WINVER Windows2000
#endif
#include <windows.h>
#undef BOOL
#endif
// Include the blocks runtime header if it's available (It shouldn't matter

8
base.make.in
View file

@ -28,10 +28,10 @@ ifeq ($(BASE_MAKE_LOADED),)
# FIXME - macro names
#
AUXILIARY_OBJCFLAGS += @NX_CONST_STRING_OBJCFLAGS@
ifeq ($(shared),no)
CONFIG_SYSTEM_LIBS += @LIBS@
CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
endif
CONFIG_SYSTEM_LIBS += @LIBS@
CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
CONFIG_SYSTEM_INCL += @CPPFLAGS@
GNUSTEP_BASE_VERSION = @VERSION@
GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@