From a7793e97a5e1e373bb75c1c12fe22d6577658c4e Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sun, 18 Dec 2005 20:48:22 +0000 Subject: [PATCH] (svn r3318) - Codechange: [FS#27] MSVC projectfile & documentation update (bociusz) --- docs/Readme_Windows_MSVC6.0.txt | 61 ++++++++++++++++----------------- langs.dsp | 8 +---- langs.vcproj | 3 +- 3 files changed, 33 insertions(+), 39 deletions(-) diff --git a/docs/Readme_Windows_MSVC6.0.txt b/docs/Readme_Windows_MSVC6.0.txt index 76ce81e316..91514f38ae 100644 --- a/docs/Readme_Windows_MSVC6.0.txt +++ b/docs/Readme_Windows_MSVC6.0.txt @@ -1,54 +1,50 @@ Compiling OpenTTD using Microsoft Visual C++ 6.0 ----Step 1 +Step 1: Ingredients Download the following files: - * Useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633) - * SDL-1.2.8-VC6.zip (http://www.libsdl.org/release/SDL-devel-1.2.8-VC6.zip) - * DirectX7.0 SDK (http://www.tt-forums.net/download.php?id=15989) (or alternatively the latest DirectX SDK from Microsoft) - * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) + * Openttd-useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633) + * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft) + * The February 2003 Microsoft Platform SDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm) (newer SDK's do not work with MSVC6) + * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) (maybe you not need this) -...and of course the newest source from svn://svn.openttd.com/trunk +...and of course the newest source from svn://svn.openttd.org/trunk -(The alpha version of the new map array can be found at svn://svn.openttd.com/branch/map) +You have to have a SVN-client to download the source: -You have to have and SVN-client to download the source: + * Command line version (Subversion 1.2.3 Win32 binaries) (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91) + * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html) - * Command line version (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91) - * TortoiseSVN (http://tortoisesvn.tigris.org/download.html) +Step 2: Includes and Libraries - ----Step 2 - -Put the newly downloaded files in the VC lib and include directories (Where C:\program files\ is your local location of VC) +Put the newly downloaded files in the VC lib and include directories (Where "C:\Program Files\Microsoft Visual Studio\VC98" is your local location of VC) * zconf.h [useful.zip] * zlib.h [useful.zip] * png.h [useful.zip] * pngconf.h [useful.zip] - * afxres.h + * afxres.h in - C:\Program Files\Microsoft Visual Studio\VC98\Include + C:\Program Files\Microsoft Visual Studio\VC98\Include and * zlibstat.lib [useful.zip] - * SDL.lib [SDL.zip] - * libpng.lib [useful.zip] + * libpng.lib [useful.zip] in - C:\Program Files\Microsoft Visual Studio\VC98\Lib + C:\Program Files\Microsoft Visual Studio\VC98\Lib ----Step 3: DirectX SDK +Step 3: DirectX SDK -(This should work with the latest DirectX SDK as well.) The installation with DirectX 7 was odd, so you'd better use the version available via the forum, see also the download link on top. +(This should work with the latest DirectX SDK as well.) There are 2 folder in the compressed file: Include and Lib @@ -62,16 +58,17 @@ C:\Program Files\Microsoft Visual Studio\VC98\Lib -You can also make custom directories, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via: +You can also make custom directories, which is recommended so you don't overwrite VS6 files, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via: Tools -> Options -> Directories -> show directories for: -a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\include ) +a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\include ) -b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 7 SDK\lib ) +b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\lib ) +NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!! ----Step 4 +Step 4: TTD Graphics files Copy the following files from Transport Tycoon Deluxe to the data folder @@ -80,14 +77,14 @@ Copy the following files from Transport Tycoon Deluxe to the data folder * trgcr.grf * trghr.grf * trgir.grf - * trgtr.grf + * trgtr.grf ----Step 5 +Step 5: Compiling -Open trunk/ttd.dsw +Open trunk/openttd.dsw -Build menu > Set active configuration > Select: "ttd - Win32 Release with PNG" +Build menu > Set active configuration > Select: "openttd - Win32 Release" Compile... @@ -96,10 +93,12 @@ Now it should work, it worked for me :) From r1319 you can compile branch/map in Debug mode (by Bociusz) -If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/#openttd) +For compiling branch/cargo-packets you have to add cargo.c and .h to this tree's openttd.dsp + +If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/openttd) Go ahead and make that patch! Happy Hacking! :) Originally written by Dribbel -Project file updating by Bociusz \ No newline at end of file +Project file updating by Bociusz diff --git a/langs.dsp b/langs.dsp index 7ab81f71ca..be1598b136 100644 --- a/langs.dsp +++ b/langs.dsp @@ -198,13 +198,7 @@ InputPath=.\lang\italian.txt # Begin Source File SOURCE=.\lang\lithuanian.txt -# Begin Custom Build -InputPath=.\lang\lithuanian.txt - -"lang\lithuanian.lng" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - strgen\debug\strgen.exe lang\lithuanian.txt - -# End Custom Build +# PROP Exclude_From_Build 1 # End Source File # Begin Source File diff --git a/langs.vcproj b/langs.vcproj index 55b14f9a92..e32319e71c 100644 --- a/langs.vcproj +++ b/langs.vcproj @@ -208,7 +208,8 @@ + Name="Debug|Win32" + ExcludedFromBuild="TRUE">