r15806 by jghali - - fix for making scimgdataloader_pgf.cpp compile on msvc
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 7 19:38:06 CET 2010
Author: jghali
Date: Sun Nov 7 18:38:06 2010
New Revision: 15806
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15806
Log:
- fix for making scimgdataloader_pgf.cpp compile on msvc
- msvc project update
Added:
trunk/Scribus/win32/vc8/scribus-pgf/
trunk/Scribus/win32/vc8/scribus-pgf/scribus-pgf.vcproj
Modified:
trunk/Scribus/scribus/scimgdataloader_pgf.cpp
trunk/Scribus/win32/vc8/Scribus.sln
trunk/Scribus/win32/vc8/Scribus.vcproj
trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj
Modified: trunk/Scribus/scribus/scimgdataloader_pgf.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15806&path=/trunk/Scribus/scribus/scimgdataloader_pgf.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_pgf.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_pgf.cpp Sun Nov 7 18:38:06 2010
@@ -4,17 +4,23 @@
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
+
+#include "scconfig.h"
+
+#include <QDebug>
#include <QFile>
#include <QByteArray>
#include <QList>
#include "scimgdataloader_pgf.h"
#include "third_party/pgf/PGFimage.h"
#include "util.h"
-#include "QDebug"
+
// C Ansi includes
extern "C"
{
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -43,11 +49,7 @@
return false;
initialize();
#ifdef WIN32
-#ifdef UNICODE
- HANDLE fd = CreateFile((LPCWSTR)(QFile::encodeName(fn).constData()), GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-#else
- HANDLE fd = CreateFile(QFile::encodeName(fn), GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
-#endif
+ HANDLE fd = CreateFileW((LPCWSTR) fn.utf16(), GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
if (fd == INVALID_HANDLE_VALUE)
return false;
#else
Modified: trunk/Scribus/win32/vc8/Scribus.sln
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15806&path=/trunk/Scribus/win32/vc8/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus.sln (original)
+++ trunk/Scribus/win32/vc8/Scribus.sln Sun Nov 7 18:38:06 2010
@@ -2,6 +2,7 @@
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-main", "Scribus.vcproj", "{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}"
ProjectSection(ProjectDependencies) = postProject
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661} = {AAA3586D-6218-4CDB-BDD2-BC0198946661}
{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
EndProjectSection
EndProject
@@ -161,14 +162,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathalongpath", "pathalongpath\pathalongpath.vcproj", "{CAF6D555-0E2E-4ABB-9585-00860B8B183E}"
ProjectSection(ProjectDependencies) = postProject
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshdistortion", "meshdistortion\meshdistortion.vcproj", "{2B610023-D3A6-4EC3-B7D5-868ED3B9321E}"
ProjectSection(ProjectDependencies) = postProject
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{6AC5EDDC-2540-47E0-873E-FE40FB06FBFD} = {6AC5EDDC-2540-47E0-873E-FE40FB06FBFD}
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pathconnect", "pathconnect\pathconnect.vcproj", "{EDE59DB3-794A-4E3F-942A-98189DF6DCE2}"
@@ -193,8 +194,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpgimport", "wpgimport\wpgimport.vcproj", "{A2A76BE2-A592-43A1-B087-068D6E082340}"
ProjectSection(ProjectDependencies) = postProject
+ {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
{50C264A1-2CE7-46A3-8C79-CBC714C49510} = {50C264A1-2CE7-46A3-8C79-CBC714C49510}
- {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pctimport", "pctimport\pctimport.vcproj", "{DB5B98E3-34C2-4909-87C6-4950BCFC9CA3}"
@@ -233,6 +234,8 @@
ProjectSection(ProjectDependencies) = postProject
{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-pgf", "scribus-pgf\scribus-pgf.vcproj", "{AAA3586D-6218-4CDB-BDD2-BC0198946661}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -626,6 +629,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
+ {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
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661}.Release-arthur|Win32.ActiveCfg = Release-arthur|Win32
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661}.Release-arthur|Win32.Build.0 = Release-arthur|Win32
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
+ {AAA3586D-6218-4CDB-BDD2-BC0198946661}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/Scribus/win32/vc8/Scribus.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15806&path=/trunk/Scribus/win32/vc8/Scribus.vcproj
==============================================================================
--- trunk/Scribus/win32/vc8/Scribus.vcproj (original)
+++ trunk/Scribus/win32/vc8/Scribus.vcproj Sun Nov 7 18:38:06 2010
@@ -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-wpg.lib"
+ 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"
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)\.""
@@ -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-wpg.lib"
+ 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"
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)\.""
@@ -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-wpg.lib"
+ 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"
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)\.""
@@ -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-wpg.lib"
+ 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"
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)\.""
@@ -1631,6 +1631,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\scimgdataloader_pgf.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\scimgdataloader_pict.cpp"
>
</File>
@@ -8868,6 +8872,10 @@
>
</File>
<File
+ RelativePath="..\..\scribus\scimgdataloader_pgf.h"
+ >
+ </File>
+ <File
RelativePath="..\..\scribus\scimgdataloader_pict.h"
>
</File>
Modified: trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15806&path=/trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj
==============================================================================
--- trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj (original)
+++ trunk/Scribus/win32/vc8/wpgimport/wpgimport.vcproj Sun Nov 7 18:38:06 2010
@@ -30,13 +30,16 @@
Name="VCPreBuildEventTool"
/>
<Tool
+ Name="rcc.exe"
+ />
+ <Tool
+ Name="lrelease.exe"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
Name="moc.exe"
- />
- <Tool
- Name="rcc.exe"
- />
- <Tool
- Name="VCCustomBuildTool"
/>
<Tool
Name="uic.exe"
@@ -53,7 +56,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\wpg;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
+ AdditionalIncludeDirectories="..;..\..\..\scribus;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins/\";AVOID_WIN32_FILEIO"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -123,13 +126,16 @@
Name="VCPreBuildEventTool"
/>
<Tool
+ Name="rcc.exe"
+ />
+ <Tool
+ Name="lrelease.exe"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
Name="moc.exe"
- />
- <Tool
- Name="rcc.exe"
- />
- <Tool
- Name="VCCustomBuildTool"
/>
<Tool
Name="uic.exe"
@@ -148,7 +154,7 @@
Optimization="1"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\wpg;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
+ AdditionalIncludeDirectories="..;..\..\..\scribus;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;;HAVE_CAIRO;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
StringPooling="true"
RuntimeLibrary="2"
@@ -220,13 +226,16 @@
Name="VCPreBuildEventTool"
/>
<Tool
+ Name="rcc.exe"
+ />
+ <Tool
+ Name="lrelease.exe"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
Name="moc.exe"
- />
- <Tool
- Name="rcc.exe"
- />
- <Tool
- Name="VCCustomBuildTool"
/>
<Tool
Name="uic.exe"
@@ -243,7 +252,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\wpg;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
+ AdditionalIncludeDirectories="..;..\..\..\scribus;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;DOCDIR=\"doc/\";ICONDIR=\"icons/\";SAMPLESDIR=\"samples/\";SCRIPTSDIR=\"scripts/\";TEMPLATEDIR=\"templates/\";LIBDIR=\"libs/\";PLUGINDIR=\"plugins/\";AVOID_WIN32_FILEIO"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -313,13 +322,16 @@
Name="VCPreBuildEventTool"
/>
<Tool
+ Name="rcc.exe"
+ />
+ <Tool
+ Name="lrelease.exe"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
Name="moc.exe"
- />
- <Tool
- Name="rcc.exe"
- />
- <Tool
- Name="VCCustomBuildTool"
/>
<Tool
Name="uic.exe"
@@ -338,7 +350,7 @@
Optimization="1"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories="..;..\..\..\scribus;..\..\..\scribus\plugins\import\wpg\wpg;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
+ AdditionalIncludeDirectories="..;..\..\..\scribus;"$(QT4_DIR)\include\QtCore";"$(QT4_DIR)\include\QtGui";"$(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""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;QT_LARGEFILE_SUPPORT;QT_EDITION=QT_EDITION_DESKTOP;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;AVOID_WIN32_FILEIO"
StringPooling="true"
RuntimeLibrary="2"
More information about the scribus-commit
mailing list