r18441 by jghali - msvc 2010 project update

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 2 22:47:42 UTC 2013


Author: jghali
Date: Mon Sep  2 22:47:42 2013
New Revision: 18441

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18441
Log:
msvc 2010 project update

Modified:
    trunk/Scribus/win32/vc10/pdfimport/pdfimport.vcxproj
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
    trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters

Modified: trunk/Scribus/win32/vc10/pdfimport/pdfimport.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18441&path=/trunk/Scribus/win32/vc10/pdfimport/pdfimport.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/pdfimport/pdfimport.vcxproj (original)
+++ trunk/Scribus/win32/vc10/pdfimport/pdfimport.vcxproj Mon Sep  2 22:47:42 2013
@@ -69,8 +69,8 @@
       <DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(POPPLER_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(LCMS_DIR)\lib;$(FREETYPE_DIR)\lib;$(LIBJPEG_DIR)\lib;$(LIBTIFF_DIR)\lib;$(QT5_DIR)\lib;$(POPPLER_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Xmld.lib;$(FREETYPE_DEBUG_LIB);$(LIBJPEG_DEBUG_LIB);$(LIBTIFF_DEBUG_LIB);$(LCMS_DEBUG_LIB);$(POPPLER_DEBUG_LIB);$(ZLIB_DEBUG_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(LCMS_DIR)\lib;$(FREETYPE_DIR)\lib;$(LIBJPEG_DIR)\lib;$(LIBTIFF_DIR)\lib;$(QT5_DIR)\lib;$(POPPLER_DIR)\lib;$(ZLIB_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)importpdf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -97,8 +97,8 @@
       <DisableSpecificWarnings>4190;4251;4267;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(POPPLER_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(LCMS_DIR)\lib;$(FREETYPE_DIR)\lib;$(LIBJPEG_DIR)\lib;$(LIBTIFF_DIR)\lib;$(QT5_DIR)\lib;$(POPPLER_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Xml.lib;$(FREETYPE_RELEASE_LIB);$(LIBJPEG_RELEASE_LIB);$(LIBTIFF_RELEASE_LIB);$(LCMS_RELEASE_LIB);$(POPPLER_RELEASE_LIB);$(ZLIB_RELEASE_LIB);scribus-api.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(LCMS_DIR)\lib;$(FREETYPE_DIR)\lib;$(LIBJPEG_DIR)\lib;$(LIBTIFF_DIR)\lib;$(QT5_DIR)\lib;$(POPPLER_DIR)\lib;$(ZLIB_DIR)\lib;$(OutDir)..;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)importpdf.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18441&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj Mon Sep  2 22:47:42 2013
@@ -198,6 +198,7 @@
     <ClInclude Include="..\..\..\scribus\canvasmode_panning.h" />
     <ClInclude Include="..\..\..\scribus\canvasmode_rotate.h" />
     <ClInclude Include="..\..\..\scribus\cellarea.h" />
+    <ClInclude Include="..\..\..\scribus\selectionrubberband.h" />
     <ClInclude Include="..\..\..\scribus\styles\cellstyle.h" />
     <moc Include="..\..\..\scribus\ui\charselect.h" />
     <moc Include="..\..\..\scribus\ui\charselectenhanced.h" />
@@ -446,6 +447,7 @@
     <ClInclude Include="..\..\..\scribus\rc4.h" />
     <moc Include="..\..\..\scribus\ui\replacecolors.h" />
     <moc Include="..\..\..\scribus\ui\replaceonecolor.h" />
+    <moc Include="..\..\..\scribus\upgradechecker.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="..\..\..\scribus\resourcecollection.h" />
     <moc Include="..\..\..\scribus\ui\rulermover.h" />
@@ -776,6 +778,8 @@
     <ClCompile Include="..\..\..\scribus\desaxe\saxiohelper.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\saxXML.cpp" />
     <ClCompile Include="..\..\..\scribus\desaxe\uniqueid.cpp" />
+    <ClCompile Include="..\..\..\scribus\moc_upgradechecker.cpp" />
+    <ClCompile Include="..\..\..\scribus\selectionrubberband.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\about.cpp" />
     <ClCompile Include="..\..\..\scribus\ui\aboutplugins.cpp" />
     <ClCompile Include="..\..\..\scribus\actionmanager.cpp" />
@@ -1192,6 +1196,7 @@
     <ClCompile Include="..\..\..\scribus\scribusapp.cpp" />
     <ClCompile Include="..\..\..\scribus\scribuscore.cpp" />
     <ClCompile Include="..\..\..\scribus\scribusdoc.cpp" />
+    <ClCompile Include="..\..\..\scribus\upgradechecker.cpp" />
     <ClCompile Include="scribuspch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

Modified: trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18441&path=/trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters (original)
+++ trunk/Scribus/win32/vc10/scribus-main/Scribus.vcxproj.filters Mon Sep  2 22:47:42 2013
@@ -1014,6 +1014,9 @@
     <ClInclude Include="..\..\..\scribus\colormgmt\sclcms2colortransformimpl.h">
       <Filter>colorMgmt</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\scribus\selectionrubberband.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -3421,6 +3424,15 @@
     </ClCompile>
     <ClCompile Include="..\..\..\scribus\colormgmt\sclcms2colortransformimpl.cpp">
       <Filter>colorMgmt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\upgradechecker.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\selectionrubberband.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\scribus\moc_upgradechecker.cpp">
+      <Filter>Generated Moc Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -4839,6 +4851,9 @@
     <moc Include="..\..\..\scribus\ui\weldedit.h">
       <Filter>Header Files</Filter>
     </moc>
+    <moc Include="..\..\..\scribus\upgradechecker.h">
+      <Filter>Header Files</Filter>
+    </moc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\scribus\color.h">




More information about the scribus-commit mailing list