Author: jghali
Date: Sat Dec 16 14:14:33 2017
New Revision: 22255
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22255
Log:
some linker warning fixes for msvc 2012 projects
Modified:
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj.filters
branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
Modified:
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22255&path=/branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
(original)
+++ branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj
Sat Dec 16 14:14:33 2017
@@ -199,7 +199,6 @@
<ItemGroup>
<ClCompile Include="..\..\..\scribus\plugins\gettext\docim\docim.cpp" />
<ClCompile Include="gettext-docimdll.cpp" />
- <ClCompile Include="..\..\..\scribus\plugins\gettext\docim\moc_docim.cpp"
/>
</ItemGroup>
<ItemGroup>
<moc Include="..\..\..\scribus\plugins\gettext\docim\docim.h" />
Modified:
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22255&path=/branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj.filters
==============================================================================
---
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj.filters
(original)
+++
branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcxproj.filters
Sat Dec 16 14:14:33 2017
@@ -9,9 +9,6 @@
<UniqueIdentifier>{f7770af3-cc2e-4ee3-9889-662525dbe72d}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
</Filter>
- <Filter Include="Generated Moc Files">
-
<UniqueIdentifier>{a25a064d-20c4-4fa7-8d1d-3f2bc23ad763}</UniqueIdentifier>
- </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\plugins\gettext\docim\docim.cpp">
@@ -20,9 +17,6 @@
<ClCompile Include="gettext-docimdll.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\scribus\plugins\gettext\docim\moc_docim.cpp">
- <Filter>Generated Moc Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<moc Include="..\..\..\scribus\plugins\gettext\docim\docim.h">
Modified: branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22255&path=/branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
==============================================================================
--- branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
(original)
+++ branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
Sat Dec 16 14:14:33 2017
@@ -204,28 +204,7 @@
</ItemGroup>
<ItemGroup>
<moc Include="..\..\..\scribus\plugins\tools\lenseffects\lensdialog.h" />
- <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.h">
- <Message
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|Win32'">Moc%27ing
%(Filename)%(Extension)</Message>
- <Message
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|x64'">Moc%27ing
%(Filename)%(Extension)</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|Win32'">$(QT4_DIR)\bin\moc.exe
"%(FullPath)" -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"
-</Command>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|x64'">$(QT4_DIR)\bin\moc.exe
"%(FullPath)" -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"
-</Command>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|Win32'">$(QT4_DIR)\bin\moc.ex;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|x64'">$(QT4_DIR)\bin\moc.ex;%(AdditionalInputs)</AdditionalInputs>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|Win32'">%(RootDir)%(Directory)\moc_%(Filename).cpp;%(Outputs)</Outputs>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Debug-cairo|x64'">%(RootDir)%(Directory)\moc_%(Filename).cpp;%(Outputs)</Outputs>
- <Message
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|Win32'">Moc%27ing
%(Filename)%(Extension)</Message>
- <Message
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|x64'">Moc%27ing
%(Filename)%(Extension)</Message>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|Win32'">$(QT4_DIR)\bin\moc.exe
"%(FullPath)" -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"
-</Command>
- <Command
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|x64'">$(QT4_DIR)\bin\moc.exe
"%(FullPath)" -o "%(RootDir)%(Directory)\moc_%(Filename).cpp"
-</Command>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|Win32'">$(QT4_DIR)\bin\moc.ex;%(AdditionalInputs)</AdditionalInputs>
- <AdditionalInputs
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|x64'">$(QT4_DIR)\bin\moc.ex;%(AdditionalInputs)</AdditionalInputs>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|Win32'">%(RootDir)%(Directory)\moc_%(Filename).cpp;%(Outputs)</Outputs>
- <Outputs
Condition="'$(Configuration)|$(Platform)'=='Release-cairo|x64'">%(RootDir)%(Directory)\moc_%(Filename).cpp;%(Outputs)</Outputs>
- </moc>
+ <moc Include="..\..\..\scribus\plugins\tools\lenseffects\lenseffects.h" />
<ClInclude
Include="..\..\..\scribus\plugins\tools\lenseffects\ui_lensdialogbase.h" />
</ItemGroup>
<ItemGroup>
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
