r18389 by jghali - Add msvc2012 solution compatible with x64 builds

scribus-commit scribus-commit at lists.scribus.net
Fri Jul 19 21:02:43 UTC 2013 

Author: jghali
Date: Fri Jul 19 21:02:43 2013
New Revision: 18389

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18389
Log:
Add msvc2012 solution compatible with x64 builds

Added:
    branches/Version14x/Scribus/win32/vc11/
    branches/Version14x/Scribus/win32/vc11/Scribus-1.4.x.sln
    branches/Version14x/Scribus/win32/vc11/Scribus-build-props.props
    branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.props
    branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.targets
    branches/Version14x/Scribus/win32/vc11/Scribus-build-rules.xml
    branches/Version14x/Scribus/win32/vc11/aiimport/
    branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcproj
    branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/aiimport/aiimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/aiimport/aiimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/barcodegenerator/
    branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcproj
    branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj
    branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegenerator.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/barcodegenerator/barcodegeneratordll.cpp
    branches/Version14x/Scribus/win32/vc11/colorwheel/
    branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcproj
    branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj
    branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheel.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/colorwheel/colorwheeldll.cpp
    branches/Version14x/Scribus/win32/vc11/cvgimport/
    branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcproj
    branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/cvgimport/cvgimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/fontpreview/
    branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcproj
    branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj
    branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreview.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/fontpreview/fontpreviewdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-csvim/
    branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-csvim/gettext-csvimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-docim/
    branches/Version14x/Scribus/win32/vc11/gettext-docim/gettext-docim.vcproj
    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/gettext-docim/gettext-docimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-htmlim/
    branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-htmlim/gettext-htmlimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-odtim/
    branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-odtim/gettext-odtimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-pdbim/
    branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-pdbim/gettext-pdbimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-sxwim/
    branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-sxwim/gettext-sxwimdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-textfilter/
    branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilter.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-textfilter/gettext-textfilterdll.cpp
    branches/Version14x/Scribus/win32/vc11/gettext-txtim/
    branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcproj
    branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj
    branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtim.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/gettext-txtim/gettext-txtimdll.cpp
    branches/Version14x/Scribus/win32/vc11/hunspellcheck/
    branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcproj
    branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj
    branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheck.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/hunspellcheck/hunspellcheckdll.cpp
    branches/Version14x/Scribus/win32/vc11/lenseffects/
    branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcproj
    branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj
    branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffects.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/lenseffects/lenseffectsdll.cpp
    branches/Version14x/Scribus/win32/vc11/meshdistortion/
    branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcproj
    branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj
    branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortion.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/meshdistortion/meshdistortiondll.cpp
    branches/Version14x/Scribus/win32/vc11/oodrawimport/
    branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcproj
    branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/oodrawimport/oodrawimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/pathalongpath/
    branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcproj
    branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj
    branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpath.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pathalongpath/pathalongpathdll.cpp
    branches/Version14x/Scribus/win32/vc11/pathconnect/
    branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcproj
    branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj
    branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnect.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pathconnect/pathconnectdll.cpp
    branches/Version14x/Scribus/win32/vc11/pathcut/
    branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcproj
    branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj
    branches/Version14x/Scribus/win32/vc11/pathcut/pathcut.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pathcut/pathcutdll.cpp
    branches/Version14x/Scribus/win32/vc11/pathfinder/
    branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcproj
    branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj
    branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinder.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pathfinder/pathfinderdll.cpp
    branches/Version14x/Scribus/win32/vc11/pathstroker/
    branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcproj
    branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj
    branches/Version14x/Scribus/win32/vc11/pathstroker/pathstroker.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pathstroker/pathstrokerdll.cpp
    branches/Version14x/Scribus/win32/vc11/pctimport/
    branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcproj
    branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/pctimport/pctimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pctimport/pctimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/pixmapexport/
    branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcproj
    branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj
    branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/pixmapexport/pixmapexportdll.cpp
    branches/Version14x/Scribus/win32/vc11/psimport/
    branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcproj
    branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/psimport/psimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/psimport/psimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/saveastemplate/
    branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcproj
    branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj
    branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplate.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/saveastemplate/saveastemplatedll.cpp
    branches/Version14x/Scribus/win32/vc11/scribus-exe/
    branches/Version14x/Scribus/win32/vc11/scribus-exe/about_builddate.inc
    branches/Version14x/Scribus/win32/vc11/scribus-exe/resource.h
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.rc
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcproj
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribus.vcxproj.user
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribusdoc.ico   (with props)
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribusicon.ico   (with props)
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribuspch.cpp
    branches/Version14x/Scribus/win32/vc11/scribus-exe/scribuspch.h
    branches/Version14x/Scribus/win32/vc11/scribus-lib2geom/
    branches/Version14x/Scribus/win32/vc11/scribus-lib2geom/scribus-lib2geom.vcproj
    branches/Version14x/Scribus/win32/vc11/scribus-lib2geom/scribus-lib2geom.vcxproj
    branches/Version14x/Scribus/win32/vc11/scribus-lib2geom/scribus-lib2geom.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scribus12format/
    branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcproj
    branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj
    branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12format.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scribus12format/scribus12formatdll.cpp
    branches/Version14x/Scribus/win32/vc11/scribus134format/
    branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcproj
    branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj
    branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134format.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scribus134format/scribus134formatdll.cpp
    branches/Version14x/Scribus/win32/vc11/scribus13format/
    branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcproj
    branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj
    branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13format.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scribus13format/scribus13formatdll.cpp
    branches/Version14x/Scribus/win32/vc11/scriptplugin/
    branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcproj
    branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj
    branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugin.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/scriptplugin/scriptplugindll.cpp
    branches/Version14x/Scribus/win32/vc11/shortwords/
    branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcproj
    branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj
    branches/Version14x/Scribus/win32/vc11/shortwords/shortwords.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/shortwords/shortwordsdll.cpp
    branches/Version14x/Scribus/win32/vc11/subdivide/
    branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcproj
    branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj
    branches/Version14x/Scribus/win32/vc11/subdivide/subdivide.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/subdivide/subdividedll.cpp
    branches/Version14x/Scribus/win32/vc11/svgexport/
    branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcproj
    branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj
    branches/Version14x/Scribus/win32/vc11/svgexport/svgexport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/svgexport/svgexportdll.cpp
    branches/Version14x/Scribus/win32/vc11/svgimport/
    branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcproj
    branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/svgimport/svgimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/svgimport/svgimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/transform/
    branches/Version14x/Scribus/win32/vc11/transform/transform.vcproj
    branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj
    branches/Version14x/Scribus/win32/vc11/transform/transform.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/transform/transformdll.cpp
    branches/Version14x/Scribus/win32/vc11/win-config.h
    branches/Version14x/Scribus/win32/vc11/wmfimport/
    branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcproj
    branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/wmfimport/wmfimportdll.cpp
    branches/Version14x/Scribus/win32/vc11/xfigimport/
    branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcproj
    branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj
    branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimport.vcxproj.filters
    branches/Version14x/Scribus/win32/vc11/xfigimport/xfigimportdll.cpp
Modified:
    branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.rc
    branches/Version14x/Scribus/win32/vc9/win-config.h

Modified: branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.rc
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18389&path=/branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.rc
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.rc (original)
+++ branches/Version14x/Scribus/win32/vc9/scribus-exe/scribus.rc Fri Jul 19 21:02:43 2013
@@ -92,13 +92,13 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "The Scribus Team"
-            VALUE "FileDescription", "Scribus 1.4.2svn"
-            VALUE "FileVersion", "1.4.2"
-            VALUE "InternalName", "Scribus 1.4.2svn"
+            VALUE "FileDescription", "Scribus 1.4.3"
+            VALUE "FileVersion", "1.4.3"
+            VALUE "InternalName", "Scribus 1.4.3"
             VALUE "LegalCopyright", "Copyright (C) 2001-2012 by The Scribus Team"
             VALUE "OriginalFilename", "Scribus.exe"
             VALUE "ProductName", "Scribus - Open Source Desktop Publishing"
-            VALUE "ProductVersion", "1.4.2"
+            VALUE "ProductVersion", "1.4.3"
         END
     END
     BLOCK "VarFileInfo"

Modified: branches/Version14x/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18389&path=/branches/Version14x/Scribus/win32/vc9/win-config.h
==============================================================================
--- branches/Version14x/Scribus/win32/vc9/win-config.h (original)
+++ branches/Version14x/Scribus/win32/vc9/win-config.h Fri Jul 19 21:02:43 2013
@@ -2,7 +2,7 @@
 #define WINCONFIG_H
 
 /* Version number of package */
-#define VERSION "1.4.3svn"
+#define VERSION "1.4.3"
 
 /* Are we building win32 native version. */
 #define BUILD_WINDOWS_VERSION 1

More information about the scribus-commit mailing list