diff --git a/ChangeLog b/ChangeLog index c425d90..803d6cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2013-06-23 Ivan Vucica + + * config.h.in: + * configure.ac: + * configure: + * Source/GSBackend.m: + Added Opal backend to appropriate places (avoiding rebuild of + configure and config.h.in). + + * Source/opal/OpalPSSurface.m: + * Source/opal/GNUmakefile: + * Source/opal/OpalFontInfo.m: + * Source/opal/OpalPDFSurface.m: + * Source/opal/OpalContext.m: + * Source/opal/OpalGState.m: + * Source/opal/OpalFontEnumerator.m: + * Source/opal/OpalSurface.m: + * Source/opal/OpalFaceInfo.m: + Added dummy files for the Opal backend. + 2013-05-11 Fred Kiefer * Source/cairo/Win32CairoSurface.m (-initWithDevice:): Make safer diff --git a/Source/GSBackend.m b/Source/GSBackend.m index ffc16e8..e0003a4 100644 --- a/Source/GSBackend.m +++ b/Source/GSBackend.m @@ -87,6 +87,8 @@ context = @"WIN32Context"; #elif (BUILD_GRAPHICS==GRAPHICS_cairo) context = @"CairoContext"; +#elif (BUILD_GRAPHICS==GRAPHICS_opal) + context = @"OpalContext"; #else #error INVALID build graphics type #endif diff --git a/Source/opal/GNUmakefile b/Source/opal/GNUmakefile new file mode 100644 index 0000000..b8bfa1d --- /dev/null +++ b/Source/opal/GNUmakefile @@ -0,0 +1,65 @@ +# Copyright (C) 2013 Free Software Foundation, Inc. +# +# Author: Ivan Vucica +# +# This file is part of the GNUstep Backend. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; see the file COPYING.LIB. +# If not, see or write to the +# Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +PACKAGE_NAME = gnustep-back +GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make +include $(GNUSTEP_MAKEFILES)/common.make + +include ../../config.make + +SUBPROJECT_NAME=opal + +# The Objective-C source files to be compiled +opal_OBJC_FILES = OpalSurface.m \ + OpalFontInfo.m \ + OpalGState.m \ + OpalContext.m \ + OpalFontEnumerator.m \ + OpalFaceInfo.m \ + OpalPSSurface.m \ + OpalPDFSurface.m \ + +ifeq ($(BUILD_SERVER),x11DISABLED) + ifeq ($(WITH_GLITZ),yes) + opal_OBJC_FILES += XGCairoGlitzSurface.m + else + opal_OBJC_FILES += XGCairoSurface.m XGCairoXImageSurface.m XGCairoModernSurface.m + endif +else + ifeq ($(BUILD_GRAPHICS),opalDISABLED) + ifeq ($(WITH_GLITZ),yes) + opal_OBJC_FILES += Win32CairoGlitzSurface.m + else + opal_OBJC_FILES += Win32CairoSurface.m Win32CairoGState.m + # Win32CairoXImageSurface.m + endif + endif +endif + +opal_OBJC_FILES += + +-include GNUmakefile.preamble + +include $(GNUSTEP_MAKEFILES)/subproject.make + +-include GNUmakefile.postamble + diff --git a/Source/opal/OpalContext.m b/Source/opal/OpalContext.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalFaceInfo.m b/Source/opal/OpalFaceInfo.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalFontEnumerator.m b/Source/opal/OpalFontEnumerator.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalFontInfo.m b/Source/opal/OpalFontInfo.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalGState.m b/Source/opal/OpalGState.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalPDFSurface.m b/Source/opal/OpalPDFSurface.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalPSSurface.m b/Source/opal/OpalPSSurface.m new file mode 100644 index 0000000..e69de29 diff --git a/Source/opal/OpalSurface.m b/Source/opal/OpalSurface.m new file mode 100644 index 0000000..e69de29 diff --git a/config.h.in b/config.h.in index b5d8907..96d7eed 100644 --- a/config.h.in +++ b/config.h.in @@ -8,6 +8,7 @@ #define GRAPHICS_xlib 2 #define GRAPHICS_winlib 3 #define GRAPHICS_cairo 4 +#define GRAPHICS_opal 5 /* Define to type of graphics context to build */ diff --git a/configure b/configure index 228ae70..ed29bdf 100755 --- a/configure +++ b/configure @@ -1349,7 +1349,7 @@ Optional Features: --disable-wgl Disable WGL support --enable-glitz Enable Glitz support --enable-server=SRV Build server type: x11, win32 - --enable-graphics=GPH Build graphics: xlib, xdps, winlib, art, cairo + --enable-graphics=GPH Build graphics: xlib, xdps, winlib, art, cairo, opal Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -7157,6 +7157,8 @@ elif test x"$BUILD_GRAPHICS" = "xxlib"; then : # Nothing to do elif test x"$BUILD_GRAPHICS" = "xwinlib"; then : # Nothing to do +elif test x"$BUILD_GRAPHICS" = "xopal"; then + : # Nothing to do else as_fn_error $? "Invalid graphics backend $BUILD_GRAPHICS" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index a953cfe..2eafe37 100644 --- a/configure.ac +++ b/configure.ac @@ -529,7 +529,7 @@ AC_ARG_ENABLE(server, [ --enable-server=SRV Build server type: x11, win32],, enable_server=$BUILD_SERVER) AC_ARG_ENABLE(graphics, - [ --enable-graphics=GPH Build graphics: xlib, xdps, winlib, art, cairo],, + [ --enable-graphics=GPH Build graphics: xlib, xdps, winlib, art, cairo, opal],, enable_graphics="$BUILD_GRAPHICS") BUILD_SERVER=$enable_server @@ -641,6 +641,8 @@ elif test x"$BUILD_GRAPHICS" = "xxlib"; then : # Nothing to do elif test x"$BUILD_GRAPHICS" = "xwinlib"; then : # Nothing to do +elif test x"$BUILD_GRAPHICS" = "xopal"; then + : # Nothing to do else AC_MSG_ERROR([Invalid graphics backend $BUILD_GRAPHICS]) fi @@ -688,6 +690,7 @@ AH_TOP([ #define GRAPHICS_xlib 2 #define GRAPHICS_winlib 3 #define GRAPHICS_cairo 4 +#define GRAPHICS_opal 5 ]) AC_DEFINE_UNQUOTED(BUILD_SERVER,SERVER_$BUILD_SERVER, [Define to type of window server to build])