Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[829] trunk/mmex/build
|
From: <kkk...@us...> - 2009-11-28 13:15:23
|
Revision: 829
http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=829&view=rev
Author: kkkvadim
Date: 2009-11-28 13:15:14 +0000 (Sat, 28 Nov 2009)
Log Message:
-----------
changes
Modified Paths:
--------------
trunk/mmex/build/bakefiles/UnitTest++.bkl
trunk/mmex/build/bakefiles/common.bkl
trunk/mmex/build/bakefiles/mmex.bkl
trunk/mmex/build/bakefiles/sqlite.bkl
trunk/mmex/build/msw/readme.txt
Added Paths:
-----------
trunk/mmex/build/bakefiles/wxsqlite.bkl
Modified: trunk/mmex/build/bakefiles/UnitTest++.bkl
===================================================================
--- trunk/mmex/build/bakefiles/UnitTest++.bkl 2009-11-28 13:13:31 UTC (rev 828)
+++ trunk/mmex/build/bakefiles/UnitTest++.bkl 2009-11-28 13:15:14 UTC (rev 829)
@@ -21,7 +21,7 @@
<if cond="TOOLSET=='unix'">/Posix</if>
</set>
- <set var="SRC">UnitTest++/src</set>
+ <set var="SRC">libs/UnitTest++</set>
<headers>$(fileList( [ SRC + '/*.h', SRC + PLATF_DIR + '/*.h' ] ))</headers>
<sources>$(fileList( [ SRC + '/*.cpp', SRC + PLATF_DIR + '/*.cpp' ] ))</sources>
Modified: trunk/mmex/build/bakefiles/common.bkl
===================================================================
--- trunk/mmex/build/bakefiles/common.bkl 2009-11-28 13:13:31 UTC (rev 828)
+++ trunk/mmex/build/bakefiles/common.bkl 2009-11-28 13:15:14 UTC (rev 829)
@@ -34,6 +34,15 @@
</if>
+ <if cond="not isdefined('BOOST_DIR')">
+ <set var="BOOSTDIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)BOOSTDIR)</set>
+ <option name="BOOST_DIR" category="path">
+ <default-value>$(BOOSTDIR_DEFAULT)</default-value>
+ <description>The directory where Boost C++ libraries is installed</description>
+ </option>
+ </if>
+
+
<!-- VC++ -->
<if cond="FORMAT.startswith('msv')">
@@ -188,20 +197,13 @@
<cxx-exceptions>on</cxx-exceptions>
<cxx-rtti>on</cxx-rtti>
+ <include cond="isdefined('BOOST_DIR')">$(BOOST_DIR)</include>
<include>$(SRCDIR)/include</include>
- <include>$(SRCDIR)/sqlite</include>
+ <include>$(SRCDIR)/libs/wxsqlite</include>
<!-- disable precompiled headers for wxWidgets -->
<define>NOPCH</define>
- <!-- flags for wxSQLite3 -->
- <define>WXSQLITE3_HAVE_CODEC</define>
- <define>WXSQLITE3_HAVE_METADATA</define>
-
- <!-- flags for TinyXml -->
- <define>TIXML_USE_STL</define>
-
-
<!-- relative to trunk/mmex -->
<set var="PLATF_DIR">
Modified: trunk/mmex/build/bakefiles/mmex.bkl
===================================================================
--- trunk/mmex/build/bakefiles/mmex.bkl 2009-11-28 13:13:31 UTC (rev 828)
+++ trunk/mmex/build/bakefiles/mmex.bkl 2009-11-28 13:15:14 UTC (rev 829)
@@ -20,13 +20,15 @@
<include file="common.bkl"/>
<include file="sqlite.bkl"/>
+ <include file="wxsqlite.bkl"/>
<!-- MoneyManagerEx application -->
<exe id="mmex" template="mmex_common">
<app-type>gui</app-type>
- <library>sqlite3</library>
+ <library>sqlite</library>
+ <library>wxsqlite</library>
<win32-res>resources/mmex.rc</win32-res>
<install-to cond="FORMAT=='autoconf'">$(BINDIR)</install-to>
Modified: trunk/mmex/build/bakefiles/sqlite.bkl
===================================================================
--- trunk/mmex/build/bakefiles/sqlite.bkl 2009-11-28 13:13:31 UTC (rev 828)
+++ trunk/mmex/build/bakefiles/sqlite.bkl 2009-11-28 13:15:14 UTC (rev 829)
@@ -9,7 +9,7 @@
<makefile>
- <lib id="sqlite3" template="compiler_common">
+ <lib id="sqlite" template="compiler_common">
<cxx-exceptions>off</cxx-exceptions>
<cxx-rtti>off</cxx-rtti>
@@ -20,7 +20,7 @@
<!-- paths relative to trunk/mmex -->
- <set var="SRC">sqlite</set>
+ <set var="SRC">libs/sqlite</set>
<headers>$(fileList(SRC + '/*.h'))</headers>
<sources>$(SRC)/sqlite3secure.c</sources>
Copied: trunk/mmex/build/bakefiles/wxsqlite.bkl (from rev 819, trunk/mmex/build/bakefiles/sqlite.bkl)
===================================================================
--- trunk/mmex/build/bakefiles/wxsqlite.bkl (rev 0)
+++ trunk/mmex/build/bakefiles/wxsqlite.bkl 2009-11-28 13:15:14 UTC (rev 829)
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+
+<!--
+ MMEX build scripts.
+ Copyright (C) 2009 VaDiM.
+
+ wxsqlite3 library.
+-->
+
+<makefile>
+
+ <lib id="wxsqlite" template="compiler_common">
+
+ <cxx-rtti>off</cxx-rtti>
+
+ <define>WXSQLITE3_HAVE_CODEC</define>
+ <define>WXSQLITE3_HAVE_METADATA</define>
+
+ <!-- paths relative to trunk/mmex -->
+
+ <set var="SRC">libs/wxsqlite</set>
+
+ <headers>$(fileList(SRC + '/wx/*.h'))</headers>
+ <sources>$(SRC)/wxsqlite3.cpp</sources>
+
+ </lib>
+
+</makefile>
Modified: trunk/mmex/build/msw/readme.txt
===================================================================
--- trunk/mmex/build/msw/readme.txt 2009-11-28 13:13:31 UTC (rev 828)
+++ trunk/mmex/build/msw/readme.txt 2009-11-28 13:15:14 UTC (rev 829)
@@ -24,12 +24,15 @@
Build these configurations: Unicode Release, Unicode Debug, Release, Debug
(or only those you need).
-3. Install GNU GetText for Windows, http://gnuwin32.sourceforge.net/packages/gettext.htm.
+3. Install Boost C++ Libraries and create an environment variable BOOSTDIR
+ that points to directory where Boost were installed.
+
+4. Install GNU GetText for Windows, http://gnuwin32.sourceforge.net/packages/gettext.htm.
This software requires to generate binary translation files from .po files.
Append path to bin folder of installed software to PATH environment variable
(usually "C:\Program Files\GnuWin32\bin").
-4. To build installation (setup) of MMEx download and install InnoSetup Quick Start Pack
+5. To build installation (setup) of MMEx download and install InnoSetup Quick Start Pack
(which includes InnoSetup itself and Inno Setup Preprocessor). Append path to folder
of installed software (something like a "C:\Program Files\Inno Setup 5")
to PATH environment variable.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|