diff options
| author | Kandrashin Denis <mail@lintest.ru> | 2013-08-15 00:49:38 +0400 |
|---|---|---|
| committer | Kandrashin Denis <mail@lintest.ru> | 2013-08-15 00:49:38 +0400 |
| commit | d1f1814d69980adbea89e498cb303e28a3172d5f (patch) | |
| tree | e4d0af215709a26f24821f47e65aa2f1f51913e8 /myrulib.bkl | |
| parent | f8bb771b980b71979b42cddcbbf7c15cdf7df959 (diff) | |
Use shared wxSQLite3 library
Diffstat (limited to 'myrulib.bkl')
| -rw-r--r-- | myrulib.bkl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/myrulib.bkl b/myrulib.bkl index 46adb80f..f67b64da 100644 --- a/myrulib.bkl +++ b/myrulib.bkl @@ -6,6 +6,7 @@ <option name="USE_FAXPP"/> <option name="USE_EXPAT"/> <option name="USE_SQLITE"/> + <option name="USE_WXSQL"/> <option name="USE_READER"/> <option name="USE_LOCALE"/> <option name="STRIP_COMMAND"/> @@ -109,7 +110,7 @@ <sources>3rdparty/crengine/src/xutils.cpp</sources> </lib> - <lib id="mrl_wxsqlite3" template="wx-lib"> + <lib id="mrl_wxsqlite3" template="wx-lib" cond="USE_WXSQL=='builtin'"> <define>NDEBUG</define> <sources>sources/WxSQLite3/wxsqlite3.cpp</sources> <include>$(SRCDIR)/3rdparty/wxsqlite3/include</include> @@ -126,14 +127,12 @@ <depends>mrl_faxpp</depends> <depends>mrl_sqlite3</depends> <depends>mrl_crengine</depends> + <depends>mrl_wxsqlite3</depends> <library>mrl_wxbzip2</library> - <library>mrl_wxsqlite3</library> <define>NDEBUG</define> <sources>sources/ZipScaner/ZipScan.cpp</sources> <sources>sources/MyRuLib/polarssl/md5.c</sources> <include>$(SRCDIR)/sources/MyRuLib</include> - <include>$(SRCDIR)/3rdparty/wxsqlite3/include</include> - <library>mrl_wxsqlite3</library> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> <threading>single</threading> @@ -224,8 +223,8 @@ <depends>mrl_faxpp</depends> <depends>mrl_sqlite3</depends> <depends>mrl_crengine</depends> + <depends>mrl_wxsqlite3</depends> <library>mrl_wxbzip2</library> - <library>mrl_wxsqlite3</library> <include>$(BUILDDIR)</include> <res-include>$(BUILDDIR)</res-include> <define>NDEBUG</define> @@ -339,7 +338,6 @@ <sources>sources/MyRuLib/wx/base64.cpp</sources> <win32-res>sources/MyRuLib/res/resource.rc</win32-res> <include>$(SRCDIR)/sources/MyRuLib</include> - <include>$(SRCDIR)/3rdparty/wxsqlite3/include</include> <include>$(SRCDIR)/3rdparty/wxbzipstream</include> <wx-lib>aui</wx-lib> <wx-lib>html</wx-lib> |