gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 20:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from 0.8.5 branch

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@16250 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-03-24 18:15:56 +00:00
parent 00e084b65f
commit b502b5346e
6 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -31,6 +31,18 @@
Added fontconfig specific code.
Patch from Derek Zhou dzhou@chrontel.com with some adaption
2003-03-24 Adam Fedor <fedor@gnu.org>
* Version: 0.8.5
2003-03-11 Adam Fedor <fedor@gnu.org>
* configure.ac: Only add libgdi32 for winlib
2003-03-08 Adam Fedor <fedor@gnu.org>
* Headers/x11/XGOpenGL.h: Standardize BOOL redefine to XWINDOWSBOOL.
2003-02-24 Adam Fedor <fedor@gnu.org>
* Version: 0.8.4

2
Documentation/news.texi
View file

@ -7,7 +7,7 @@
@include version.texi
@end ifset
@section Noteworthy changes in version @samp{0.8.3}
@section Noteworthy changes in version @samp{0.8.5}
Text system improvements. See the gnustep-gui NEWS for changes.

2
Headers/x11/XGOpenGL.h
View file

@ -30,7 +30,7 @@
#include <AppKit/NSOpenGL.h>
#define id _gs_avoid_id_collision
#define BOOL _gs_avoid_BOOL_collision
#define BOOL XWINDOWSBOOL
#include <GL/glx.h>
#undef id
#undef BOOL

2
Version
View file

@ -4,7 +4,7 @@
# The version number of this release.
GNUSTEP_BACK_MAJOR_VERSION=0
GNUSTEP_BACK_MINOR_VERSION=8
GNUSTEP_BACK_SUBMINOR_VERSION=4
GNUSTEP_BACK_SUBMINOR_VERSION=5
GNUSTEP_BACK_VERSION=${GNUSTEP_BACK_MAJOR_VERSION}.${GNUSTEP_BACK_MINOR_VERSION}.${GNUSTEP_BACK_SUBMINOR_VERSION}
VERSION=${GNUSTEP_BACK_VERSION}

4
configure vendored
View file

@ -5592,7 +5592,7 @@ else
fi
if test "$have_gdi32" = yes; then
GRAPHIC_LIBS="-lgdi32 ${GRAPHIC_LIBS}"
WIN32_LIBS="-lgdi32"
fi
CPPFLAGS="${save_header}"
LIBS="${save_libs}"
@ -6027,6 +6027,8 @@ echo "$as_me: error: can't find freetype, required for graphics=art!" >&2;}
echo "$as_me: error: can't find libart, required for graphics=art!" >&2;}
{ (exit 1); exit 1; }; }
fi
elif test x"$BUILD_GRAPHICS" = "xwinlib"; then
GRAPHIC_LIBS="$WIN32_LIBS $GRAPHIC_LIBS"
fi

4
configure.ac
View file

@ -389,7 +389,7 @@ CPPFLAGS="${GRAPHIC_CFLAGS} ${GRAPHIC_LFLAGS} ${CPPFLAGS}"
LIBS="${GRAPHIC_LIBS} ${LIBS}"
AC_CHECK_LIB(gdi32, main, have_gdi32=yes, have_gdi32=no)
if test "$have_gdi32" = yes; then
GRAPHIC_LIBS="-lgdi32 ${GRAPHIC_LIBS}"
WIN32_LIBS="-lgdi32"
fi
CPPFLAGS="${save_header}"
LIBS="${save_libs}"
@ -476,6 +476,8 @@ elif test x"$BUILD_GRAPHICS" = "xart"; then
if test "$have_libart_lgpl_2" = no; then
AC_MSG_ERROR([can't find libart, required for graphics=art!])
fi
elif test x"$BUILD_GRAPHICS" = "xwinlib"; then
GRAPHIC_LIBS="$WIN32_LIBS $GRAPHIC_LIBS"
fi
AH_TOP([