r16124 by jghali - enable use of private cairo branch on Windows
scribus-commit
scribus-commit at lists.scribus.net
Tue Dec 21 15:34:54 CET 2010
Author: jghali
Date: Tue Dec 21 14:34:53 2010
New Revision: 16124
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16124
Log:
enable use of private cairo branch on Windows
Added:
trunk/Scribus/scribus/third_party/cairo/cairo-truetype-subset-private.h
trunk/Scribus/scribus/third_party/cairo/cairo-truetype-subset.c
trunk/Scribus/scribus/third_party/cairo/cairo-win32-surface.c
trunk/Scribus/win32/vc8/scribus-cairo/
trunk/Scribus/win32/vc8/scribus-cairo/scribus-cairo.vcproj
Modified:
trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
trunk/Scribus/scribus/third_party/cairo/cairo-compiler-private.h
trunk/Scribus/scribus/third_party/cairo/cairo-features.h
trunk/Scribus/scribus/third_party/cairo/cairo-mesh-gradient-rasterizer.c
trunk/Scribus/scribus/third_party/cairo/cairo.c
trunk/Scribus/win32/vc8/Scribus-build.vsprops
trunk/Scribus/win32/vc8/Scribus.sln
trunk/Scribus/win32/vc8/Scribus.vcproj
Modified: trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt Tue Dec 21 14:34:53 2010
@@ -85,7 +85,9 @@
SET(CAIRO_WIN32_ONLY_SOURCES
cairo-win32-font.c
cairo-win32-printing-surface.c
+ cairo-win32-surface.c
cairo-scaled-font-subsets.c
+ cairo-truetype-subset.c
)
ELSE(WIN32)
SET(CAIRO_WIN32_ONLY_SOURCES)
Modified: trunk/Scribus/scribus/third_party/cairo/cairo-compiler-private.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/scribus/third_party/cairo/cairo-compiler-private.h
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairo-compiler-private.h (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairo-compiler-private.h Tue Dec 21 14:34:53 2010
@@ -173,30 +173,6 @@
#define inline __inline
#endif
-#if defined(_MSC_VER) && defined(_M_IX86)
-/* When compiling with /Gy and /OPT:ICF identical functions will be folded in together.
- The CAIRO_ENSURE_UNIQUE macro ensures that a function is always unique and
- will never be folded into another one. Something like this might eventually
- be needed for GCC but it seems fine for now. */
-#define CAIRO_ENSURE_UNIQUE \
- do { \
- char func[] = __FUNCTION__; \
- char file[] = __FILE__; \
- __asm { \
- __asm jmp __internal_skip_line_no \
- __asm _emit (__LINE__ & 0xff) \
- __asm _emit ((__LINE__>>8) & 0xff) \
- __asm _emit ((__LINE__>>16) & 0xff) \
- __asm _emit ((__LINE__>>24) & 0xff) \
- __asm lea eax, func \
- __asm lea eax, file \
- __asm __internal_skip_line_no: \
- }; \
- } while (0)
-#else
-#define CAIRO_ENSURE_UNIQUE do { } while (0)
-#endif
-
#ifdef __STRICT_ANSI__
#undef inline
#define inline __inline__
Modified: trunk/Scribus/scribus/third_party/cairo/cairo-features.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/scribus/third_party/cairo/cairo-features.h
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairo-features.h (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairo-features.h Tue Dec 21 14:34:53 2010
@@ -16,5 +16,7 @@
#define CAIRO_HAS_WIN32_SURFACE 1
#define CAIRO_HAS_WIN32_FONT 1
#undef CAIRO_HAS_FC_FONT
+ #undef CAIRO_HAS_FT_FONT
+ #undef CAIRO_HAS_PNG_FUNCTIONS
#endif
#endif
Modified: trunk/Scribus/scribus/third_party/cairo/cairo-mesh-gradient-rasterizer.c
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/scribus/third_party/cairo/cairo-mesh-gradient-rasterizer.c
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairo-mesh-gradient-rasterizer.c (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairo-mesh-gradient-rasterizer.c Tue Dec 21 14:34:53 2010
@@ -49,6 +49,15 @@
*/
#define VPARSTEPS 64.0
#define UPARSTEPS 64.0
+
+#if defined (_WIN32)
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
+#endif
/* Utils */
Modified: trunk/Scribus/scribus/third_party/cairo/cairo.c
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/scribus/third_party/cairo/cairo.c
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/cairo.c (original)
+++ trunk/Scribus/scribus/third_party/cairo/cairo.c Tue Dec 21 14:34:53 2010
@@ -89,7 +89,6 @@
cairo_status_t
_cairo_error (cairo_status_t status)
{
- CAIRO_ENSURE_UNIQUE;
assert (_cairo_status_is_error (status));
return status;
Modified: trunk/Scribus/win32/vc8/Scribus-build.vsprops
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/win32/vc8/Scribus-build.vsprops
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus-build.vsprops (original)
+++ trunk/Scribus/win32/vc8/Scribus-build.vsprops Tue Dec 21 14:34:53 2010
@@ -37,6 +37,10 @@
Value="E:\Libs-msvc2005\libtiff-3.8.2"
/>
<UserMacro
+ Name="PIXMAN_DIR"
+ Value="E:\Libs-msvc2005\pixman-0.18.0"
+ />
+ <UserMacro
Name="PODOFO_DIR"
Value="E:\Libs-msvc2005\podofo-0.8.0"
/>
Modified: trunk/Scribus/win32/vc8/Scribus.sln
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/win32/vc8/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus.sln (original)
+++ trunk/Scribus/win32/vc8/Scribus.sln Tue Dec 21 14:34:53 2010
@@ -4,6 +4,7 @@
ProjectSection(ProjectDependencies) = postProject
{AAA3586D-6218-4CDB-BDD2-BC0198946661} = {AAA3586D-6218-4CDB-BDD2-BC0198946661}
{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454} = {7D5110DE-0EA4-43CD-882C-1B86DCE78454}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svgexport", "svgexport\svgexport.vcproj", "{9652EA11-AFA0-4CDF-88AC-7912C653EFE6}"
@@ -234,6 +235,8 @@
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-cairo", "scribus-cairo\scribus-cairo.vcproj", "{7D5110DE-0EA4-43CD-882C-1B86DCE78454}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-pgf", "scribus-pgf\scribus-pgf.vcproj", "{AAA3586D-6218-4CDB-BDD2-BC0198946661}"
EndProject
@@ -629,6 +632,14 @@
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
{A46C3979-E6DD-408F-BB9E-ED5EC3292AFA}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Debug-arthur|Win32.ActiveCfg = Debug-arthur|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Debug-arthur|Win32.Build.0 = Debug-arthur|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Release-arthur|Win32.ActiveCfg = Release-arthur|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
+ {7D5110DE-0EA4-43CD-882C-1B86DCE78454}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
{AAA3586D-6218-4CDB-BDD2-BC0198946661}.Debug-arthur|Win32.ActiveCfg = Debug-arthur|Win32
{AAA3586D-6218-4CDB-BDD2-BC0198946661}.Debug-arthur|Win32.Build.0 = Debug-arthur|Win32
{AAA3586D-6218-4CDB-BDD2-BC0198946661}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
Modified: trunk/Scribus/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16124&path=/trunk/Scribus/win32/vc8/Scribus.vcproj
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus.vcproj (original)
+++ trunk/Scribus/win32/vc8/Scribus.vcproj Tue Dec 21 14:34:53 2010
@@ -58,8 +58,8 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_PRIVATE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -163,8 +163,8 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CAIRO;HAVE_PRIVATE_CAIRO;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
StringPooling="true"
RuntimeLibrary="2"
BufferSecurityCheck="true"
@@ -188,7 +188,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -266,7 +266,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
@@ -292,7 +292,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -371,7 +371,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(CAIRO_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
+ AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\cairo;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(QT4_DIR)\include\QtNetwork";"$(QT4_DIR)\include\QtWebKit";"$(QT4_DIR)\include\QtXml";"$(QT4_DIR)\include";"$(QT4_DIR)\src\3rdparty\zlib";"$(LCMS_DIR)\include";"$(FREETYPE_DIR)\include";"$(LIBJPEG_DIR)\include";"$(LIBTIFF_DIR)\include";"$(PODOFO_DIR)\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;HAVE_CONFIG_H;AVOID_WIN32_FILEIO;COMPILE_SCRIBUS_MAIN_APP;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";SHAREDIR=\"share/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins\""
StringPooling="true"
RuntimeLibrary="2"
@@ -396,7 +396,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-pgf.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-cairo.lib scribus-pgf.lib scribus-wpg.lib"
OutputFile="$(OutDir)\Scribus.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(OutDir)\.""
@@ -11329,6 +11329,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\ui\ui_prefs_pagesizesbase.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\ui\ui_prefs_pathsbase.h"
>
</File>
More information about the scribus-commit
mailing list