compile with MSVC 2008

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22339 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index fa84abd1aaff348494318ba60910471cbc719350..2883da1ae681da5a9e0baef597ee7aec37cbd74a 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -1,64 +1,46 @@
-Compiling LyX 1.5 for Win32
+Compiling LyX 1.6 for Win32

 ===========================
 
 ===========================
 

-LyX 1.5 can be compiled with Microsoft Visual C++ 2005 (recommended) or MinGW.
+LyX 1.6 can be compiled with Microsoft Visual C++ 2008 (recommended) or MinGW.

 
 

-Compiling with MSVC 2005
+Compiling with MSVC 2008

 ========================
 
 ========================
 

-1      Install MSVC 2005 SP1
+1      Install MSVC 2008

 
 

-       If you don't have MSVC 2005 installed, download and install the free
-       Express edition from http://msdn.microsoft.com/vstudio/express/visualc/
-       From this page you should also download and install Service Pack 1.
+       If you don't have MSVC 2008 installed, download and install the free
+       Express edition from http://www.microsoft.com/express/vc/

 
 

-       A hotfix needs to be installed because of a bug in the compiler.
-       Search for VS80sp1-KB930859-X86-ENU.exe on Google and install it.
-
-2      Install the Windows Platform SDK
-
-       see: http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
-       (You don't need to install the IIS, MDAC, and Tablet PC SDK that are
-        delivered with the Platform SDK.)
-
-3      Configure MSVC
-
-       Follow exactly the steps of
-       http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
-       In Step 3 follow also the things noted as alternative.
-       (If you later get an error message that "windows.h" cannot be found,
-        create the global Windows environment variables "INCLUDE" and "LIB".
-        INCLUDE contains the paths to the "include" folders of the installed
-        platform SDK and of MSVC. LIB contains the corresponding "lib" folders.)
-
-4      Install Python
+2      Install Python

 
        Get the latest Python 2.5 version at
 
        Get the latest Python 2.5 version at

-       http://www.python.org/download/releases/2.5/
+       http://www.python.org/download/

 
        Install in C:\Python25 and add this directory to the PATH environment
        variable (Start > Settings > Control Panel > System > Advanced >
        Environment Variables).
 
 
        Install in C:\Python25 and add this directory to the PATH environment
        variable (Start > Settings > Control Panel > System > Advanced >
        Environment Variables).
 

-5      Install SCons
+3      Install SCons

 
 

-       Download and install SCons 0.96.92 (or newer, but not 0.96.1) from http://www.scons.org/download.php
+       Download the latest SCons version from http://www.scons.org/download.php

 
 

-6      Install the dependencies
+4      Install the dependencies

 
 

-       Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc-qt4_3_2.zip
+       Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc2008.zip

        and extract in the root directory of your LyX files (so you will get
        and extract in the root directory of your LyX files (so you will get

-       a directory called lyx-windows-deps-msvc-qt4 next to the other directories
+       a directory called lyx-windows-deps-msvc2008 next to the other directories

        like src, development etc.).
 
        like src, development etc.).
 

-7      Compile
+5      Compile
+
+       Start a Visual Studio command prompt (Start > Programs >
+       Microsoft Visual C++ 9.0 Express Edition > Visual Studio Tools >
+       Visual Studio 2008 Command Prompt) and run:

 
 

-       From MS Visual Studio command prompt (not the regular cmd.exe), 
-       run 
-         > cd <lyx root directory>\development\Win32\packaging
-         > build_msvc.bat
+       cd <lyx root directory>\development\Win32\packaging
+       build_msvc.bat

 
 

-8      First start of LyX
+6      First start of LyX

 
        To start the just compiled lyx.exe, it is necessary to copy the following
        files to the folder where the just compiled "lyx.exe" is:
 
        To start the just compiled lyx.exe, it is necessary to copy the following
        files to the folder where the just compiled "lyx.exe" is:


@@ -67,37 +49,37 @@ Compiling with MSVC 2005
        aspell.dll
        iconv.dll
        intl.dll
        aspell.dll
        iconv.dll
        intl.dll

-       Microsoft.VC80.CRT.manifest
-       msvcp80.dll
-       msvcr80.dll
+       Microsoft.VC90.CRT.manifest
+       msvcp90.dll
+       msvcr90.dll

        QtCore4.dll
        QtGui4.dll
 
        QtCore4.dll
        QtGui4.dll
 

-       msvcp80.dll and msvcr80.dll are the C Runtime and C++ libraries
-       supplied with MSVC 2005. They are freely redistributable.
-       See http://msdn2.microsoft.com/en-us/library/8kche8ah(VS.80).aspx
+       msvcp90.dll and msvcr90.dll are the C Runtime and C++ libraries
+       supplied with MSVC 2008. They are freely redistributable.
+       See http://msdn2.microsoft.com/en-us/library/8kche8ah.aspx

        for details.
 
        All of the other .dlls above and the lyx executable are compiled
        from code released under the GPL which states (section 3) that
        for details.
 
        All of the other .dlls above and the lyx executable are compiled
        from code released under the GPL which states (section 3) that

-       GPL software may be linked against system files such as msvcp80.dll
-       and msvcr80.dll.
+       GPL software may be linked against system files such as msvcp90.dll
+       and msvcr90.dll.

 
 Compiling with MinGW
 ====================
 
        These instructions allow you to create a basic LyX build with MinGW.
 
 Compiling with MinGW
 ====================
 
        These instructions allow you to create a basic LyX build with MinGW.

-       To be able to use all LyX features, compiling with MSVC 2005 is recommended.
+       To be able to use all LyX features, compiling with MSVC 2008 is recommended.

        Creating an installer for MinGW builds is no longer supported.
 
 1      Install MinGW, and all the gcc-related stuff, and win32api. 
 
        Creating an installer for MinGW builds is no longer supported.
 
 1      Install MinGW, and all the gcc-related stuff, and win32api. 
 

-2      download qt-win-opensource-4.x.x-mingw.exe and install to c:\qt\4.2.2.
+2      download qt-win-opensource-4.x.x-mingw.exe and install to c:\qt.

 
 3      install python and scons as instructed above. Set $path for python
           to make your life a bit easier.
 
 
 3      install python and scons as instructed above. Set $path for python
           to make your life a bit easier.
 

-4      Check out lyx svn to c:\lyx-devel\lyx-1.5.x
+4      Check out lyx svn to c:\lyx-devel\lyx-1.6.x

 
 5      Download zlib binaries and developer files (zlib-1.2.3-bin.zip and
           zlib-1.2.3-lib.zip) from http://gnuwin32.sourceforge.net/packages/zlib.htm
 
 5      Download zlib binaries and developer files (zlib-1.2.3-bin.zip and
           zlib-1.2.3-lib.zip) from http://gnuwin32.sourceforge.net/packages/zlib.htm


@@ -106,13 +88,13 @@ Compiling with MinGW
           unpack all of them to the same directory c:\lyx-devel\mingw_deps.
 
 6      start a command window, run commands:
           unpack all of them to the same directory c:\lyx-devel\mingw_deps.
 
 6      start a command window, run commands:

-          $ cd c:\lyx-devel\lyx-1.5.x
+          $ cd c:\lyx-devel\lyx-1.6.x

           $ scons -f development\scons\SConstruct \
               extra_lib_path=..\mingw_deps\lib  \
                   extra_inc_path=..\mingw_deps\include \
                   extra_bin_path=..\mingw_deps\bin \
           $ scons -f development\scons\SConstruct \
               extra_lib_path=..\mingw_deps\lib  \
                   extra_inc_path=..\mingw_deps\include \
                   extra_bin_path=..\mingw_deps\bin \

-                  qt_dir=c:\qt\4.2.2 \
-                  DESTDIR=..\lyx-1.5-install \
+                  qt_dir=c:\qt \
+                  DESTDIR=..\lyx-1.6-install \

                   install
 
 
                   install
 
 

diff --git a/development/Win32/packaging/Microsoft.VC80.CRT.manifest b/development/Win32/packaging/Microsoft.VC80.CRT.manifest
deleted file mode 100644 (file)
index 8b3800b..0000000
--- a/development/Win32/packaging/Microsoft.VC80.CRT.manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<!-- Copyright © 1981-2001 Microsoft Corporation -->\r
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
-    <noInheritable/>\r
-    <assemblyIdentity \r
-        type="win32" \r
-        name="Microsoft.VC80.CRT" \r
-        version="8.0.50727.762" \r
-        processorArchitecture="x86" \r
-        publicKeyToken="1fc8b3b9a1e18e3b"\r
-    />\r
-    <file name="msvcr80.dll"/>\r
-    <file name="msvcp80.dll"/>\r
-    <file name="msvcm80.dll"/>\r
-</assembly>\r

diff --git a/development/Win32/packaging/Microsoft.VC90.CRT.manifest b/development/Win32/packaging/Microsoft.VC90.CRT.manifest
new file mode 100644 (file)
index 0000000..d3a615b
--- /dev/null
+++ b/development/Win32/packaging/Microsoft.VC90.CRT.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->\r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
+    <noInheritable/>\r
+    <assemblyIdentity\r
+        type="win32"\r
+        name="Microsoft.VC90.CRT"\r
+        version="9.0.21022.8"\r
+        processorArchitecture="x86"\r
+        publicKeyToken="1fc8b3b9a1e18e3b"\r
+    />\r
+    <file name="msvcr90.dll" /> <file name="msvcp90.dll" /> <file name="msvcm90.dll" />\r
+</assembly>\r

diff --git a/development/Win32/packaging/build_msvc.bat b/development/Win32/packaging/build_msvc.bat
index 9b99f8ad9d9448e8eea2a1bf5c3de8a183d64413..b08e9cd18fa8a293ddedfbda5681f7e8f958dacc 100644 (file)
--- a/development/Win32/packaging/build_msvc.bat
+++ b/development/Win32/packaging/build_msvc.bat
@@ -1,3 +1,3 @@
 cd ..\..\scons
 cd ..\..\scons

-call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=release version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc-qt4\include extra_lib_path=..\..\lyx-windows-deps-msvc-qt4\lib extra_bin_path=..\..\lyx-windows-deps-msvc-qt4\bin qt_dir=..\..\lyx-windows-deps-msvc-qt4\qt-4
+call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=release version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc2008\include extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\lyx-windows-deps-msvc2008\qt-4

 cd ..\Win32\packaging
\ No newline at end of file
 cd ..\Win32\packaging
\ No newline at end of file

diff --git a/development/Win32/packaging/build_msvs_debug.bat b/development/Win32/packaging/build_msvs_debug.bat
index d0c9ab2f6bda6b32666bd1528b29918f36cc3436..8be2f867f3ca4be0e056aee50d7730ddda958539 100644 (file)
--- a/development/Win32/packaging/build_msvs_debug.bat
+++ b/development/Win32/packaging/build_msvs_debug.bat
@@ -1,4 +1,4 @@
 cd ..\..\scons
 cd ..\..\scons

-call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=debug version_suffix=15 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc-qt4\include extra_lib_path=..\..\lyx-windows-deps-msvc-qt4\lib extra_bin_path=..\..\lyx-windows-deps-msvc-qt4\bin qt_dir=..\..\lyx-windows-deps-msvc-qt4\qt-4
+call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=debug version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc2008\include extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\lyx-windows-deps-msvc2008\qt-4

 call scons msvs_projects
 cd ..\Win32\packaging
\ No newline at end of file
 call scons msvs_projects
 cd ..\Win32\packaging
\ No newline at end of file

diff --git a/development/Win32/packaging/installer/components/dicts.nsh b/development/Win32/packaging/installer/components/dicts.nsh
index 95dfb9d66e97e56060618328eef322c5864a593b..d964608d4f66c996cf7ae7296a452b1ce6bc3304 100644 (file)
--- a/development/Win32/packaging/installer/components/dicts.nsh
+++ b/development/Win32/packaging/installer/components/dicts.nsh
@@ -55,7 +55,7 @@ ${DICT} hr-0.51-0 "Hrvatski" hr 1967
 ${DICT} is-0.51.1-0 "Íslenska" is 1536
 ${DICT} it-2.2_20050523-0 "Italiano" it 696
 ${DICT} hu-0.99.4.2-0 "Magyar" hu 1608
 ${DICT} is-0.51.1-0 "Íslenska" is 1536
 ${DICT} it-2.2_20050523-0 "Italiano" it 696
 ${DICT} hu-0.99.4.2-0 "Magyar" hu 1608

-${DICT} nl-0.50-2 "Nederlands" nl 1526
+${DICT} nl-opentaal200711.exe "Nederlands" nl 1333

 ${DICT} nn-0.50.1-1 "Nynorsk" nn 1930
 ${DICT} fa-0.11-0 "Persian" fa 1667
 ${DICT} pl-6.0_20061121-0 "Polski" pl 1859
 ${DICT} nn-0.50.1-1 "Nynorsk" nn 1930
 ${DICT} fa-0.11-0 "Persian" fa 1667
 ${DICT} pl-6.0_20061121-0 "Polski" pl 1859

diff --git a/development/Win32/packaging/installer/include/filelists.nsh b/development/Win32/packaging/installer/include/filelists.nsh
index 93a536a94dc4153737223e62a5fc9bf67c87b1f7..095b3520d365a5c75d6b3fc2ffce69e5bd9e0613 100644 (file)
--- a/development/Win32/packaging/installer/include/filelists.nsh
+++ b/development/Win32/packaging/installer/include/filelists.nsh
@@ -34,14 +34,14 @@ Lists of files to include in the installer
 
 !macro FileListMSVCBin COMMAND DIRECTORY
 
 
 !macro FileListMSVCBin COMMAND DIRECTORY
 

-  ${FILE}msvcr80.dll"
-  ${FILE}msvcp80.dll"
+  ${FILE}msvcr90.dll"
+  ${FILE}msvcp90.dll"

   
 !macroend
 
 !macro FileListMSVCManifest COMMAND DIRECTORY
 
   
 !macroend
 
 !macro FileListMSVCManifest COMMAND DIRECTORY
 

-  ${FILE}\Microsoft.VC80.CRT.manifest"
+  ${FILE}\Microsoft.VC90.CRT.manifest"

   
 !macroend
 
   
 !macroend
 

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 62d7fe91da400b9749eadc1b3311959b643e889a..7307fda908ab337537840c56a59a3687c0e3cde2 100644 (file)
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
@@ -13,7 +13,7 @@ Settings for LyX installer
 !define FILES_LAUNCHER "..\..\launcher"\r
 !define FILES_PDFVIEW "..\..\pdfview"\r
 \r
 !define FILES_LAUNCHER "..\..\launcher"\r
 !define FILES_PDFVIEW "..\..\pdfview"\r
 \r

-!define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.762_x-ww_6b128700"\r
+!define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375"\r

 !define FILES_NETPBM "${FILES_DEPS}\netpbm"\r
 !define FILES_DTL "${FILES_DEPS}\dtl"\r
 !define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\"\r
 !define FILES_NETPBM "${FILES_DEPS}\netpbm"\r
 !define FILES_DTL "${FILES_DEPS}\dtl"\r
 !define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\"\r


@@ -38,12 +38,12 @@ Settings for LyX installer
   !define DOWNLOADALT_${ID} "${MIRROR_SF2}/${FILENAME}"\r
 !macroend\r
 \r
   !define DOWNLOADALT_${ID} "${MIRROR_SF2}/${FILENAME}"\r
 !macroend\r
 \r

-!insertmacro SourceForgeMirror LATEX "miktex/basic-miktex-2.6.2726.exe"\r
-!insertmacro SourceForgeMirror IMAGEMAGICK "imagemagick/ImageMagick-6.3.4-10-Q16-windows-dll.exe"\r
-!insertmacro SourceForgeMirror GHOSTSCRIPT "ghostscript/gs857w32.exe"\r
+!insertmacro SourceForgeMirror LATEX "miktex/basic-miktex-2.7.2904.exe"\r
+!insertmacro SourceForgeMirror IMAGEMAGICK "imagemagick/ImageMagick-6.3.7-8-Q16-windows-dll.exe"\r
+!insertmacro SourceForgeMirror GHOSTSCRIPT "ghostscript/gs861w32.exe"\r

 \r
 \r

-!define DOWNLOAD_VIEWER "http://tug.ctan.org/tex-archive/nonfree/support/ghostscript/ghostgum/gsv48w32.exe"\r
-!define DOWNLOADALT_VIEWER "http://ctan.basemirror.de/nonfree/support/ghostscript/ghostgum/gsv48w32.exe"\r
+!define DOWNLOAD_VIEWER "http://tug.ctan.org/tex-archive/nonfree/support/ghostscript/ghostgum/gsv49w32.exe"\r
+!define DOWNLOADALT_VIEWER "http://ctan.basemirror.de/nonfree/support/ghostscript/ghostgum/gsv49w32.exe"\r

 \r
 !define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows"\r
 !define DOWNLOADALT_ASPELLDICTS "http://www.lyx.org/~bpeng/aspell6-windows"\r
 \r
 !define DOWNLOAD_ASPELLDICTS "ftp://ftp.lyx.org/pub/lyx/contrib/aspell6-windows"\r
 !define DOWNLOADALT_ASPELLDICTS "http://www.lyx.org/~bpeng/aspell6-windows"\r


@@ -51,26 +51,26 @@ Settings for LyX installer
 #--------------------------------\r
 #Download size (in KB)\r
 \r
 #--------------------------------\r
 #Download size (in KB)\r
 \r

-!define SIZE_DOWNLOAD_LATEX 53512\r
-!define SIZE_DOWNLOAD_IMAGEMAGICK 7111\r
-!define SIZE_DOWNLOAD_GHOSTSCRIPT 11916\r
-!define SIZE_DOWNLOAD_VIEWER 1459\r
+!define SIZE_DOWNLOAD_LATEX 78493\r
+!define SIZE_DOWNLOAD_IMAGEMAGICK 7330\r
+!define SIZE_DOWNLOAD_GHOSTSCRIPT 12469\r
+!define SIZE_DOWNLOAD_VIEWER 1467\r

 \r
 #--------------------------------\r
 #Approximations of space required for components (in KB)\r
 \r
 \r
 #--------------------------------\r
 #Approximations of space required for components (in KB)\r
 \r

-!define SIZE_LATEX 120000\r
-!define SIZE_IMAGEMAGICK 18000\r
-!define SIZE_GHOSTSCRIPT 30000\r
+!define SIZE_LATEX 225000\r
+!define SIZE_IMAGEMAGICK 18700\r
+!define SIZE_GHOSTSCRIPT 31500\r

 !define SIZE_VIEWER 4000\r
 \r
 #--------------------------------\r
 #Locations of setup files for components (for bundled setup)\r
 \r
 !define SIZE_VIEWER 4000\r
 \r
 #--------------------------------\r
 #Locations of setup files for components (for bundled setup)\r
 \r

-!define INSTALL_LATEX "basic-miktex-2.6.2726.exe"\r
-!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.4-10-Q16-windows-dll.exe"\r
-!define INSTALL_GHOSTSCRIPT "gs857w32.exe"\r
-!define INSTALL_VIEWER "gsv48w32.exe"\r
+!define INSTALL_LATEX "basic-miktex-2.7.2904.exe"\r
+!define INSTALL_IMAGEMAGICK "ImageMagick-6.3.7-8-Q16-windows-dll.exe"\r
+!define INSTALL_GHOSTSCRIPT "gs861w32.exe"\r
+!define INSTALL_VIEWER "gsv49w32.exe"\r

 \r
 #--------------------------------\r
 #Names and version\r
 \r
 #--------------------------------\r
 #Names and version\r


@@ -82,7 +82,7 @@ Settings for LyX installer
 !define APP_SERIES_KEY "16"\r
 !define APP_DIR_USERDATA "LyX16"\r
 !define APP_INFO "${APP_NAME} - The Document Processor"\r
 !define APP_SERIES_KEY "16"\r
 !define APP_DIR_USERDATA "LyX16"\r
 !define APP_INFO "${APP_NAME} - The Document Processor"\r

-!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2007 LyX Team"\r
+!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2008 LyX Team"\r

 \r
 !define APP_RUN "bin\lyx.exe"\r
 \r
 \r
 !define APP_RUN "bin\lyx.exe"\r
 \r


@@ -99,9 +99,9 @@ Settings for LyX installer
 #Setup settings\r
 \r
 !ifndef SETUPTYPE_BUNDLE\r
 #Setup settings\r
 \r
 !ifndef SETUPTYPE_BUNDLE\r

-  !define /date SETUP_EXE "lyx-15svn-%Y%m%d.exe"\r
+  !define /date SETUP_EXE "lyx-16svn-%Y%m%d.exe"\r

 !else\r
 !else\r

-  !define /date SETUP_EXE "lyx-15svn-%Y%m%d-bundle.exe"\r
+  !define /date SETUP_EXE "lyx-16svn-%Y%m%d-bundle.exe"\r

 !endif\r
 \r
 !define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"\r
 !endif\r
 \r
 !define SETUP_DEFAULT_DIRECTORY "$PROGRAMFILES\${APP_NAME}${APP_SERIES_KEY}"\r

diff --git a/development/Win32/packaging/installer/settings.user.nsh b/development/Win32/packaging/installer/settings.user.nsh
index 7195fb14b1fafa5559357dd505f89dd30cdf211a..52e3a771391a894c18c6775fedbdec929a3e5551 100644 (file)
--- a/development/Win32/packaging/installer/settings.user.nsh
+++ b/development/Win32/packaging/installer/settings.user.nsh
@@ -13,7 +13,7 @@
 !ifdef FilesDeps\r
   !define FILES_DEPS "${FilesDeps}"\r
 !else\r
 !ifdef FilesDeps\r
   !define FILES_DEPS "${FilesDeps}"\r
 !else\r

-  !define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"\r
+  !define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc2008"\r

 !endif\r
 \r
 !ifdef FilesBundle\r
 !endif\r
 \r
 !ifdef FilesBundle\r

diff --git a/development/scons/build_msvc.bat b/development/scons/build_msvc.bat
index d76a67994f2f997aa725caafd34203d783ab6d54..85df66341093e38599ff24519bf33ccad21f35f8 100644 (file)
--- a/development/scons/build_msvc.bat
+++ b/development/scons/build_msvc.bat
@@ -1 +1 @@
-call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=release version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc-qt4\include extra_lib_path=..\..\lyx-windows-deps-msvc-qt4\lib extra_bin_path=..\..\lyx-windows-deps-msvc-qt4\bin qt_dir=..\..\lyx-windows-deps-msvc-qt4\qt-4
\ No newline at end of file
+call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=release version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc2008\include extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\lyx-windows-deps-msvc2008\qt-4
\ No newline at end of file

diff --git a/development/scons/build_msvs_debug.bat b/development/scons/build_msvs_debug.bat
index deaf616ac7926c62a82c1390d020cd694d5ee731..f9979e67c8eb5d780f5f6755e0fc0e8b187f8b5c 100644 (file)
--- a/development/scons/build_msvs_debug.bat
+++ b/development/scons/build_msvs_debug.bat
@@ -1,2 +1,2 @@
-call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=debug version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc-qt4\include extra_lib_path=..\..\lyx-windows-deps-msvc-qt4\lib extra_bin_path=..\..\lyx-windows-deps-msvc-qt4\bin qt_dir=..\..\lyx-windows-deps-msvc-qt4\qt-4
-call scons msvs_projects
+call scons install prefix=..\..\build-msvc use_vc=yes frontend=qt4 mode=debug version_suffix=16 gettext=system nls=yes extra_inc_path=..\..\lyx-windows-deps-msvc2008\include extra_lib_path=..\..\lyx-windows-deps-msvc2008\lib extra_bin_path=..\..\lyx-windows-deps-msvc2008\bin qt_dir=..\..\lyx-windows-deps-msvc2008\qt-4
+call scons msvs_projects
\ No newline at end of file