Revision: 7403
http://mahogany.svn.sourceforge.net/mahogany/?rev=7403&view=rev
Author: vadz
Date: 2008-03-04 05:28:46 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
use VC7-specific project files in M.sln; update Windows build instructions
Modified Paths:
--------------
trunk/M/M.sln
trunk/M/doc/build_win.txt
Modified: trunk/M/M.sln
===================================================================
--- trunk/M/M.sln 2008-02-24 03:27:26 UTC (rev 7402)
+++ trunk/M/M.sln 2008-03-04 13:28:46 UTC (rev 7403)
@@ -20,31 +20,31 @@
{461C65F9-FD63-4262-8AAB-578E9E0EC485} =
{461C65F9-FD63-4262-8AAB-578E9E0EC485}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base",
"L:\wx\HEAD\build\msw\wx_base.vcproj", "{03CC77E1-56F2-4536-9578-1DC4D858DC16}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base",
"L:\wx\HEAD\build\msw\wx_vc7_base.vcproj",
"{03CC77E1-56F2-4536-9578-1DC4D858DC16}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv",
"L:\wx\HEAD\build\msw\wx_adv.vcproj", "{390CE24E-8BF0-4606-B218-BE13AF7C0160}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv",
"L:\wx\HEAD\build\msw\wx_vc7_adv.vcproj",
"{390CE24E-8BF0-4606-B218-BE13AF7C0160}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html",
"L:\wx\HEAD\build\msw\wx_html.vcproj", "{458FA00B-681B-46F2-9C32-FB717D4D4609}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html",
"L:\wx\HEAD\build\msw\wx_vc7_html.vcproj",
"{458FA00B-681B-46F2-9C32-FB717D4D4609}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg",
"L:\wx\HEAD\build\msw\wx_wxjpeg.vcproj",
"{9F67E589-0373-4100-81E4-AC7D3328BAAF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg",
"L:\wx\HEAD\build\msw\wx_vc7_wxjpeg.vcproj",
"{9F67E589-0373-4100-81E4-AC7D3328BAAF}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex",
"L:\wx\HEAD\build\msw\wx_wxregex.vcproj",
"{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex",
"L:\wx\HEAD\build\msw\wx_vc7_wxregex.vcproj",
"{F41FC06D-BF41-4A39-A4B6-9FCD6B4FFAFE}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff",
"L:\wx\HEAD\build\msw\wx_wxtiff.vcproj",
"{C1814137-3DDE-4ADC-876B-EAA86E2900AC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff",
"L:\wx\HEAD\build\msw\wx_vc7_wxtiff.vcproj",
"{C1814137-3DDE-4ADC-876B-EAA86E2900AC}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib",
"L:\wx\HEAD\build\msw\wx_wxzlib.vcproj",
"{18A0EF1F-2476-46F9-936F-A6B46274FA7A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib",
"L:\wx\HEAD\build\msw\wx_vc7_wxzlib.vcproj",
"{18A0EF1F-2476-46F9-936F-A6B46274FA7A}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
@@ -53,7 +53,7 @@
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5} =
{86C1D2C7-C961-4017-88E8-63D0BCCBD0D5}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng",
"L:\wx\HEAD\build\msw\wx_wxpng.vcproj", "{62C959C3-EC09-4323-9FB8-DC39A4428CAE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng",
"L:\wx\HEAD\build\msw\wx_vc7_wxpng.vcproj",
"{62C959C3-EC09-4323-9FB8-DC39A4428CAE}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
@@ -65,19 +65,19 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core",
"L:\wx\HEAD\build\msw\wx_core.vcproj", "{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core",
"L:\wx\HEAD\build\msw\wx_vc7_core.vcproj",
"{8C0797F8-5B9F-4B33-957B-01552CD9F2DE}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net",
"L:\wx\HEAD\build\msw\wx_net.vcproj", "{461C65F9-FD63-4262-8AAB-578E9E0EC485}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net",
"L:\wx\HEAD\build\msw\wx_vc7_net.vcproj",
"{461C65F9-FD63-4262-8AAB-578E9E0EC485}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa",
"L:\wx\HEAD\build\msw\wx_qa.vcproj", "{0B20B2A1-6D5F-4366-9154-6995152A07EC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa",
"L:\wx\HEAD\build\msw\wx_vc7_qa.vcproj",
"{0B20B2A1-6D5F-4366-9154-6995152A07EC}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml",
"L:\wx\HEAD\build\msw\wx_xml.vcproj", "{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml",
"L:\wx\HEAD\build\msw\wx_vc7_xml.vcproj",
"{4D31FA55-B643-4CB3-A8F5-5AA5179317F3}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Modified: trunk/M/doc/build_win.txt
===================================================================
--- trunk/M/doc/build_win.txt 2008-02-24 03:27:26 UTC (rev 7402)
+++ trunk/M/doc/build_win.txt 2008-03-04 13:28:46 UTC (rev 7403)
@@ -3,8 +3,8 @@
Audience: Mahogany developers
Author: Vadim Zeitlin <[EMAIL PROTECTED]>
Modified by: Nerijus Baliunas <[EMAIL PROTECTED]> (cygwin part)
-Last modified: 2004-07-14
-Version: the information in this file applies to the cvs sources
+Last modified: 2008-03-04
+Version: the information in this file applies to the svn sources
0. Requirements
---------------
@@ -13,19 +13,20 @@
MS Visual C++ 7.1 and cygwin. Previous versions of Visual C++ (5/6/7.0)
could probably be used as well but the project files haven't been updated
for them since quite some time and so this definitely won't work out of
- the box but require some effort from your part.
+ the box but require some effort from your part. Later versions of VC++ (VC8,
+ a.k.a. 2005, and VC9 a.k.a. 2008) should work as well but you need to import
+ the projects which are only available in VC7 versions currently.
If you are interested in building using another compiler (mingw32, BC++)
please contact us and we will try to help you.
-b) cvs client: you need to have daily access to Mahogany (and sometimes
- wxWidgets) source tree, and the cvs is the only way to keep up to date. The
- precompiled cvs binaries for Win32 can be found at http://www.cyclic.com/
+b) svn client: you need to have daily access to Mahogany (and sometimes
+ wxWidgets) source tree, and the svn is the only way to keep up to date.
c) GNU m4 from cygwin tools: this is not an absolute requirement, however you
will not be able to compile *.mid (Mahogany Interface Description) files if
you don't have it and so you will have to use the versions already in the
- cvs. If you do have m4, set the environment variable M4 to contain its full
+ svn. If you do have m4, set the environment variable M4 to contain its full
path (or just m4 if it is in your PATH), otherwise it won't be used.
@@ -38,46 +39,22 @@
Mahogany depends on wxWidgets and prior to compiling Mahogany you need to
build the wxMSW library.
- You may use either wxMSW 2.5.3 release (latest 2.5 release as of the time
-of this writing, if a newer one is available, do use it) or the latest
-wxWidgets sources from cvs HEAD which usually provide more functionality. Note
-that you may use M_STABLE tag to check out the wxWidgets version which is known
-to work well with Mahogany.
+ Currently Mahogany requires wxWidgets sources from svn (it is possible to
+build against wx 2.8 but the project files have been modified to be used with
+svn wx version so you'd need to use an older version of them to build with 2.8,
+please contact me if you really need to do this). When wx 2.9.0 is release it
+will be possible to use it too.
Before building Mahogany you will need to build wxWidgets. To do it, you
-should open build/msw/wx.dsw in wxWidgets directory and build all projects in
-it. You may use extra\scripts\wxmsw_setup.h file instead of the standard
+should open build/msw/wx_vc7.sln in wxWidgets directory and build all projects
+in it. You may use extra\scripts\wxmsw_setup.h file instead of the standard
setup.h when building if you want to disable all the features not needed by
Mahogany but doing this is optional and you should revert to the standard
wx/setup.h if using wxmsw_setup.h results in errors (it is not always up to
date...).
- Also before opening M.sln for the first time, open it in any text editor
-and replace all occurences of "L:\wxWidgets" with the path where your version
-of wxWidgets is installed.
-
-b) DSPAM
---------
-
- Building Mahogany with DSPAM requires SQlite library: http://www.sqlite.org/
-Note that you need SQlite version 2 (currently the latest version is 2.8.17)
-and not version 3 as they're incompatible and dspam driver only works with
-SQlite 2. You should download its sources and build it using lib\sqlite.vcproj
-project file (you will need to copy it to the directory where you unpacked
-SQlite sources) and add the directory containing sqlite.h to the list of global
-include paths in VC++ IDE. You should also add the library directory containing
-sqlite[d].lib (the debug version should have "d" in its name) to the list of
-library paths.
-
- If you don't want to install SQlite, you will have to skip building dspam
-project and DspamFilter.cpp file located in modules/spam subfolder of the
-source files of M project in the IDE (simply set "Excluded from build" to true
-in its properties). You will also need to remove dspam.lib from the linker
-inputs in the linker options of M project.
-
-
-c) Python
+b) Python
---------
If you want to build Mahogany with an embedded Python interpreter, you need
@@ -93,7 +70,7 @@
from build.
-d) Build process
+c) Build process
----------------
Before loading M.sln file, you will need to open it in your favourite text
@@ -120,13 +97,6 @@
additional information.
-e) Common problems
-------------------
-
-- dspam doesn't compile
-+ check that you installed sqlite as explained above
-
-
2. Cygwin
---------
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
