[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1578
Date : Thu Jul 27 18:18:42 BST 2006
Changed paths:
M /Trunk/XaraLX/Makefile.am
M /Trunk/XaraLX/configure.in
M /Trunk/XaraLX/xarlib
A /Trunk/XaraLX/xarlib/Makefile.am
Added configure flag to enable building of xarlib using current tree, plus mechanics to do it.
Diff:
Index: Trunk/XaraLX/xarlib/Makefile.am
===================================================================
--- Trunk/XaraLX/xarlib/Makefile.am (revision 0)
+++ Trunk/XaraLX/xarlib/Makefile.am (revision 1578)
@@ -0,0 +1,149 @@
+#########################################################################
+# LIBRARY SECTION
+#########################################################################
+# this is librairy that is part of main executable. it's name is used for all
+# of the other Makefile.am variables
+#noinst_LIBRARIES = libXar.a
+lib_LTLIBRARIES = libXar.la
+
+XARLIBFLAGS = \
+ -DUSE_NATIVE_XLONG -DBUILDSHADOWS -DOLD_MATRIX_TRANSFORMATIONS \
+ -DVECTOR_STROKING -DEXCLUDE_FROM_XARLIB -DNEW_SHADOW_RENDER -DNO_XARACMS \
+ -DNEW_FEATURES -DSHOWPORTNOTE -DDO_EXPORT
+
+# make sure this does NOT have our include files in the path
+# xarlib needs to be first
+libXar_la_CXXFLAGS = -I$(TOPDIR)/xarlib -I$(TOPDIR)/PreComp -I$(TOPDIR)/Kernel -I$(TOPDIR)/wxOil -I$(TOPDIR)/GDraw $(XARLIBFLAGS)
+
+#Extra libraries
+#libXar_la_LDFLAGS = @GTK_LIBS@
+
+libXar_la_SOURCES = \
+ ../Kernel/ccfile.cpp \
+ ../Kernel/ccmaths.cpp \
+ ../Kernel/ccpanose.cpp \
+ ../Kernel/coord.cpp \
+ ../Kernel/cxfile.cpp \
+ ../Kernel/cxfmap.cpp \
+ ../Kernel/cxfrec.cpp \
+ ../Kernel/cxfrech.cpp \
+ ../Kernel/doccoord.cpp \
+ ../Kernel/docrect.cpp \
+ ../Kernel/f16spec.cpp \
+ ../Kernel/fixed16.cpp \
+ ../Kernel/fixed.cpp \
+ ../Kernel/fttyplis.cpp \
+ ../Kernel/list.cpp \
+ ../Kernel/listitem.cpp \
+ ../Kernel/matrix.cpp \
+ ../Kernel/pathproc.cpp \
+ ../Kernel/paths.cpp \
+ ../Kernel/pathutil.cpp \
+ ../Kernel/rechcomp.cpp \
+ ../Kernel/vector.cpp \
+ ../Kernel/xlong.cpp \
+ ../Kernel/zdeflate.cpp \
+ ../Kernel/zdftrees.cpp \
+ ../Kernel/ziftrees.cpp \
+ ../Kernel/zinflate.cpp \
+ ../Kernel/zstream.cpp \
+ ../wxOil/basestr.cpp \
+ ../wxOil/camresource.cpp \
+ ../wxOil/ccobject.cpp \
+ ../wxOil/errors.cpp \
+ ../wxOil/filehndl.cpp \
+ ../wxOil/filesize.cpp \
+ ../wxOil/fixmem.cpp \
+ ../wxOil/fixst128.cpp \
+ ../wxOil/fixst256.cpp \
+ ../wxOil/fixstr16.cpp \
+ ../wxOil/fixstr32.cpp \
+ ../wxOil/fixstr64.cpp \
+ ../wxOil/fixstr8.cpp \
+ ../wxOil/handles.cpp \
+ ../wxOil/makemsg.cpp \
+ ../wxOil/memblk.cpp \
+ ../wxOil/cammemory.cpp \
+ ../wxOil/pathname.cpp \
+ ../wxOil/unicdman.cpp \
+ camelot.cpp \
+ ensure.cpp \
+ xarlib.cpp
+
+if FALSE
+pkginclude_HEADERS = PreComp/camtypes.h \
+ wxOil/basestr.h \
+ wxOil/camresource.h \
+ wxOil/camstring.h \
+ wxOil/ccobject.h \
+ wxOil/compatdef.h \
+ wxOil/errors.h \
+ wxOil/exception.h \
+ wxOil/fixmem.h \
+ wxOil/fixst128.h \
+ wxOil/fixst256.h \
+ wxOil/fixstr16.h \
+ wxOil/fixstr32.h \
+ wxOil/fixstr64.h \
+ wxOil/fixstr8.h \
+ wxOil/handles.h \
+ wxOil/hardwaremanager.h \
+ wxOil/memblk.h \
+ wxOil/memdebug.h \
+ wxOil/memory.h \
+ wxOil/mfccontainer.h \
+ wxOil/pathname.h \
+ wxOil/stdwx.h \
+ wxOil/unicdman.h \
+ wxOil/varstr.h \
+ Kernel/attr.h \
+ Kernel/ccfile.h \
+ Kernel/ccmaths.h \
+ Kernel/ccpanose.h \
+ Kernel/coord.h \
+ Kernel/cxfarrow.h \
+ Kernel/cxfcols.h \
+ Kernel/cxfdash.h \
+ Kernel/cxfdefs.h \
+ Kernel/cxfile.h \
+ Kernel/cxfmap.h \
+ Kernel/cxfrec.h \
+ Kernel/cxfrech.h \
+ Kernel/cxftags.h \
+ Kernel/doccoord.h \
+ Kernel/docrect.h \
+ Kernel/f16spec.h \
+ Kernel/fixed16.h \
+ Kernel/fixed.h \
+ Kernel/fttyplis.h \
+ Kernel/list.h \
+ Kernel/listitem.h \
+ Kernel/macros.h \
+ Kernel/matrix.h \
+ Kernel/pathproc.h \
+ Kernel/paths.h \
+ Kernel/pathtype.h \
+ Kernel/pathutil.h \
+ Kernel/rechcomp.h \
+ Kernel/taglists.h \
+ Kernel/vector.h \
+ Kernel/xlong.h \
+ Kernel/zdeflate.h \
+ Kernel/zinflate.h \
+ Kernel/zlib.h \
+ Kernel/zstream.h \
+ Kernel/zutil.h \
+ xarlib/camelot.h \
+ xarlib/ensure.h \
+ xarlib/gconsts.h \
+ xarlib/xarlib.h
+
+bin_PROGRAMS = expandxar
+
+expandxar_SOURCES = ExpandXar/expandxar.cpp
+expandxar_LDADD = libXar.la $(WX_LIBS)
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = Xar.pc
+
+endif
Property changes on: Trunk/XaraLX/xarlib
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in (revision 1577)
+++ Trunk/XaraLX/configure.in (revision 1578)
@@ -33,6 +33,11 @@
[Disable svn versioning]),
SvnVersionEnable="$enableval", SvnVersionEnable="yes")
+AC_ARG_ENABLE(xarlib,
+ AS_HELP_STRING([--enable-xarlib],
+ [Enable build of the xarlib filter library]),
+ XarLibEnable="$enableval", XarLibEnable="no")
+
OPT_FLAGS34="-fno-strict-aliasing"
WARN_FLAGS34="-Wstrict-aliasing=2"
@@ -355,6 +360,7 @@
AM_CONDITIONAL(DARWIN_LINK, [test "$DarwinLink" = "yes"])
AM_CONDITIONAL(INTERNATIONAL_ENABLE, [test "$InternationalEnable" = "yes"])
AM_CONDITIONAL(SVNVERSION_ENABLE, [test "$SvnVersionEnable" = "yes"])
+AM_CONDITIONAL(XARLIB_ENABLE, [test "$XarLibEnable" = "yes"])
AC_SUBST(TOPDIR)
AC_SUBST(WX_LIBS)
@@ -369,4 +375,4 @@
AC_SUBST(PODIR)
AC_SUBST(BUILDRESFLAGS)
-AC_OUTPUT(Makefile PreComp/Makefile Kernel/Makefile wxOil/Makefile tools/Makefile wxXtra/Makefile po/Makefile.in)
+AC_OUTPUT(Makefile PreComp/Makefile Kernel/Makefile wxOil/Makefile tools/Makefile wxXtra/Makefile xarlib/Makefile po/Makefile.in)
Index: Trunk/XaraLX/Makefile.am
===================================================================
--- Trunk/XaraLX/Makefile.am (revision 1577)
+++ Trunk/XaraLX/Makefile.am (revision 1578)
@@ -10,12 +10,17 @@
PRECOMPILE_DIR = PreComp
endif
+XARLIB_DIR =
+if XARLIB_ENABLE
+ XARLIB_DIR = xarlib
+endif
+
# Do not compile po directory if WXRC is broken (gentoo wxWidgets 2.6.3.2)
# Leave the '#po' on the end to keep automake quiet
if INTERNATIONAL_ENABLE
-SUBDIRS = $(PRECOMPILE_DIR) wxXtra wxOil Kernel tools po
+SUBDIRS = $(PRECOMPILE_DIR) wxXtra wxOil Kernel tools $(XARLIB_DIR) po
else
-SUBDIRS = $(PRECOMPILE_DIR) wxXtra wxOil Kernel tools
+SUBDIRS = $(PRECOMPILE_DIR) wxXtra wxOil Kernel tools $(XARLIB_DIR)
endif
# We clean these here not in the wxOil makefile to prevent a loop
Xara