r15654 by jghali - msvc project update
scribus-commit
scribus-commit at lists.scribus.net
Tue Oct 26 02:11:23 CEST 2010
Author: jghali
Date: Tue Oct 26 00:11:23 2010
New Revision: 15654
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15654
Log:
msvc project update
Modified:
branches/ScribusOIF/win32/vc8/Scribus-build.vsprops
branches/ScribusOIF/win32/vc8/Scribus.vcproj
Modified: branches/ScribusOIF/win32/vc8/Scribus-build.vsprops
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15654&path=/branches/ScribusOIF/win32/vc8/Scribus-build.vsprops
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus-build.vsprops (original)
+++ branches/ScribusOIF/win32/vc8/Scribus-build.vsprops Tue Oct 26 00:11:23 2010
@@ -6,7 +6,7 @@
>
<UserMacro
Name="QT4_DIR"
- Value="E:\Libs-msvc2005\qt-4.6.1"
+ Value="E:\Libs-msvc2005\qt-4.6.3"
/>
<UserMacro
Name="BOOST_DIR"
@@ -18,11 +18,15 @@
/>
<UserMacro
Name="FREETYPE_DIR"
- Value="E:\Libs-msvc2005\freetype-2.3.12"
+ Value="E:\Libs-msvc2005\freetype-2.4.2"
/>
<UserMacro
Name="ICONV_DIR"
Value="E:\Libs-msvc2005\iconv-1.9.2"
+ />
+ <UserMacro
+ Name="ICU_DIR"
+ Value="E:\Libs-msvc2005\icu-4.0.1"
/>
<UserMacro
Name="LCMS_DIR"
@@ -38,7 +42,7 @@
/>
<UserMacro
Name="PODOFO_DIR"
- Value="E:\Libs-msvc2005\podofo-0.8.0"
+ Value="E:\Libs-msvc2005\podofo-0.8.2"
/>
<UserMacro
Name="LIBXML2_DIR"
Modified: branches/ScribusOIF/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15654&path=/branches/ScribusOIF/win32/vc8/Scribus.vcproj
==============================================================================
--- branches/ScribusOIF/win32/vc8/Scribus.vcproj (original)
+++ branches/ScribusOIF/win32/vc8/Scribus.vcproj Tue Oct 26 00:11:23 2010
@@ -58,7 +58,7 @@
Optimization="0"
InlineFunctionExpansion="0"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(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\harfbuzz\src;"$(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";"$(ICU_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\""
IgnoreStandardIncludePath="false"
MinimalRebuild="true"
@@ -84,10 +84,10 @@
/>
<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-harfbuzz.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib iculed.lib icuucd.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-harfbuzz.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)\.""
+ AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
AssemblyDebug="0"
@@ -163,7 +163,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..\vc8;..\..\scribus;..\..\scribus\colormgmt;..\..\scribus\fonts;..\..\scribus\text;..\..\scribus\styles;..\..\scribus\simpletreemodel;..\..\scribus\ui;..\..\scribus\third_party\harfbuzz\src;"$(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\harfbuzz\src;"$(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";"$(ICU_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\""
StringPooling="true"
RuntimeLibrary="2"
@@ -188,10 +188,10 @@
/>
<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-harfbuzz.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib icule.lib icuuc.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-harfbuzz.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)\.""
+ AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\Scribus.pdb"
SubSystem="2"
@@ -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;..\..\scribus\third_party\harfbuzz\src;"$(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\harfbuzz\src;"$(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";"$(ICU_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,10 +292,10 @@
/>
<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-harfbuzz.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCored4.lib QtGuid4.lib QtNetworkd4.lib QtXmld4.lib QtWebKitd4.lib freetypeD.lib cairo2d.lib iculed.lib icuucd.lib libjpeg.a libtiff.lib lcms2_staticd.lib mscms.lib PoDoFoLibD.lib WSock32.Lib scribus-harfbuzz.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)\.""
+ AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
AssemblyDebug="0"
@@ -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;..\..\scribus\third_party\harfbuzz\src;"$(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\harfbuzz\src;"$(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";"$(ICU_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,10 +396,10 @@
/>
<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-harfbuzz.lib scribus-wpg.lib"
+ AdditionalDependencies="QtCore4.lib QtGui4.lib QtNetwork4.lib QtXml4.lib QtWebKit4.lib qtmain.lib freetype.lib cairo2.lib icule.lib icuuc.lib libjpeg.a libtiff.lib lcms2_static.lib mscms.lib PoDoFoLib.lib WSock32.Lib scribus-harfbuzz.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)\.""
+ AdditionalLibraryDirectories=""$(QT4_DIR)\lib";"$(LCMS_DIR)\lib";"$(FREETYPE_DIR)\lib";"$(CAIRO_DIR)\lib";"$(LIBJPEG_DIR)\lib";"$(LIBTIFF_DIR)\lib";"$(PODOFO_DIR)\lib";"$(ICU_DIR)\lib";"$(OutDir)\.""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\Scribus.pdb"
SubSystem="2"
@@ -1643,6 +1643,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\fonts\scicufont.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\scimage.cpp"
>
</File>
@@ -9052,6 +9056,10 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\scribus\fonts\scicufont.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\scimage.h"
>
</File>
More information about the scribus-commit
mailing list