r20451 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 9 20:19:40 UTC 2015 

Author: jghali
Date: Fri Oct  9 20:19:40 2015
New Revision: 20451

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20451
Log:
msvc project update: add project for new rtf imported

Added:
    trunk/Scribus/win32/vc11/gettext-rtfim/
    trunk/Scribus/win32/vc11/gettext-rtfim/gettext-rtfim.vcxproj
    trunk/Scribus/win32/vc11/gettext-rtfim/gettext-rtfim.vcxproj.filters
    trunk/Scribus/win32/vc11/scribus-rtf/
    trunk/Scribus/win32/vc11/scribus-rtf/scribus-rtf-pch.cpp
    trunk/Scribus/win32/vc11/scribus-rtf/scribus-rtf-pch.h
    trunk/Scribus/win32/vc11/scribus-rtf/scribus-rtf.vcxproj
    trunk/Scribus/win32/vc11/scribus-rtf/scribus-rtf.vcxproj.filters
Modified:
    trunk/Scribus/win32/vc11/Scribus.sln
    trunk/Scribus/win32/vc11/scribus-zip/scribus-zip.vcxproj

Modified: trunk/Scribus/win32/vc11/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20451&path=/trunk/Scribus/win32/vc11/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus.sln	(original)
+++ trunk/Scribus/win32/vc11/Scribus.sln	Fri Oct  9 20:19:40 2015
@@ -332,6 +332,13 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdrimport", "cdrimport\cdrimport.vcxproj", "{50B6573C-3462-4D85-B22B-4D85625B9284}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scribus-rtf", "scribus-rtf\scribus-rtf.vcxproj", "{8E82EC40-9A9F-4545-8811-C257E5229099}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettext-rtfim", "gettext-rtfim\gettext-rtfim.vcxproj", "{7960ABE3-443F-413A-89A3-B345EC275E5D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8E82EC40-9A9F-4545-8811-C257E5229099} = {8E82EC40-9A9F-4545-8811-C257E5229099}
 	EndProjectSection
 EndProject
 Global
@@ -878,6 +885,22 @@
 		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|Win32.Build.0 = Release|Win32
 		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|x64.ActiveCfg = Release|x64
 		{50B6573C-3462-4D85-B22B-4D85625B9284}.Release|x64.Build.0 = Release|x64
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Debug|Win32.Build.0 = Debug|Win32
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Debug|x64.ActiveCfg = Debug|x64
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Debug|x64.Build.0 = Debug|x64
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Release|Win32.ActiveCfg = Release|Win32
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Release|Win32.Build.0 = Release|Win32
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Release|x64.ActiveCfg = Release|x64
+		{8E82EC40-9A9F-4545-8811-C257E5229099}.Release|x64.Build.0 = Release|x64
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Debug|Win32.Build.0 = Debug|Win32
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Debug|x64.ActiveCfg = Debug|x64
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Debug|x64.Build.0 = Debug|x64
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Release|Win32.ActiveCfg = Release|Win32
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Release|Win32.Build.0 = Release|Win32
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Release|x64.ActiveCfg = Release|x64
+		{7960ABE3-443F-413A-89A3-B345EC275E5D}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/vc11/scribus-zip/scribus-zip.vcxproj
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20451&path=/trunk/Scribus/win32/vc11/scribus-zip/scribus-zip.vcxproj
==============================================================================
--- trunk/Scribus/win32/vc11/scribus-zip/scribus-zip.vcxproj	(original)
+++ trunk/Scribus/win32/vc11/scribus-zip/scribus-zip.vcxproj	Fri Oct  9 20:19:40 2015
@@ -35,7 +35,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6CC39EED-B1E2-4209-8F65-0E6242EE63E5}</ProjectGuid>
-    <RootNamespace>scribuswpg</RootNamespace>
+    <RootNamespace>scribuszip</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -108,7 +108,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\vc10;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vc11;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,7 +123,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\vc10;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vc11;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -140,7 +140,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\vc10;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vc11;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -155,7 +155,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\vc10;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\vc11;..\..\..\scribus;$(QT5_DIR)\include\QtANGLE;$(QT5_DIR)\include\QtCore;$(QT5_DIR)\include\QtGui;$(QT5_DIR)\include\QtNetwork;$(QT5_DIR)\include\QtWidgets;$(QT5_DIR)\include\QtXml;$(QT5_DIR)\include;$(ZLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;COMPILE_PLUGIN_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>

More information about the scribus-commit mailing list