You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(137) |
Dec
(43) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
(58) |
Jun
(3) |
Jul
(27) |
Aug
(14) |
Sep
(6) |
Oct
|
Nov
(4) |
Dec
(33) |
2011 |
Jan
(85) |
Feb
(37) |
Mar
(47) |
Apr
(39) |
May
(49) |
Jun
(75) |
Jul
(39) |
Aug
(27) |
Sep
(27) |
Oct
(31) |
Nov
(46) |
Dec
(34) |
2012 |
Jan
(131) |
Feb
(189) |
Mar
(202) |
Apr
(122) |
May
(269) |
Jun
(191) |
Jul
(169) |
Aug
(82) |
Sep
(81) |
Oct
(93) |
Nov
(71) |
Dec
(95) |
2013 |
Jan
(143) |
Feb
(113) |
Mar
(107) |
Apr
(173) |
May
(216) |
Jun
(184) |
Jul
(229) |
Aug
(13) |
Sep
(196) |
Oct
(405) |
Nov
(351) |
Dec
(374) |
2014 |
Jan
(288) |
Feb
(105) |
Mar
(107) |
Apr
(188) |
May
(139) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ste...@us...> - 2014-05-18 03:12:55
|
Revision: 6605 http://sourceforge.net/p/moneymanagerex/code/6605 Author: stef145g Date: 2014-05-18 03:12:53 +0000 (Sun, 18 May 2014) Log Message: ----------- Update svn revision counter Modified Paths: -------------- trunk/src/constants.cpp Modified: trunk/src/constants.cpp =================================================================== --- trunk/src/constants.cpp 2014-05-18 03:07:45 UTC (rev 6604) +++ trunk/src/constants.cpp 2014-05-18 03:12:53 UTC (rev 6605) @@ -165,3 +165,4 @@ const wxString ATTACHMENTS_FOLDER_DATABASE = "%DATABASE%"; const wxString ATTACHMENTS_FOLDER_USERPROFILE = "%USERPROFILE%"; const wxString ATTACHMENTS_FOLDER_APPDATA = "%APPDATA%"; + This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-18 03:07:49
|
Revision: 6604 http://sourceforge.net/p/moneymanagerex/code/6604 Author: stef145g Date: 2014-05-18 03:07:45 +0000 (Sun, 18 May 2014) Log Message: ----------- Tests: Updated user Info Modified Paths: -------------- trunk/tests/test_checking.cpp trunk/tests/test_relocate_payee.cpp Modified: trunk/tests/test_checking.cpp =================================================================== --- trunk/tests/test_checking.cpp 2014-05-18 02:48:38 UTC (rev 6603) +++ trunk/tests/test_checking.cpp 2014-05-18 03:07:45 UTC (rev 6604) @@ -421,6 +421,7 @@ { TestFrameBase* user_request = new TestFrameBase(m_base_frame); user_request->Show(); + user_request->Show_InfoBarMessage("Loading data from database...\n\nPlease wait..."); // Create a new frame anchored to the base frame. TestFrameBase* account_frame = new TestFrameBase(m_base_frame, 670, 400); @@ -444,6 +445,7 @@ { TestFrameBase* user_request = new TestFrameBase(m_base_frame); user_request->Show(); + user_request->Show_InfoBarMessage("Loading data from database...\n\nPlease wait..."); // Create a new frame anchored to the base frame. TestFrameBase* account_frame = new TestFrameBase(m_base_frame, 670, 400); Modified: trunk/tests/test_relocate_payee.cpp =================================================================== --- trunk/tests/test_relocate_payee.cpp 2014-05-18 02:48:38 UTC (rev 6603) +++ trunk/tests/test_relocate_payee.cpp 2014-05-18 03:07:45 UTC (rev 6604) @@ -130,7 +130,7 @@ CPPUNIT_ASSERT(Model_Checking::instance().get(1)->PAYEEID == payee_supermarket->id()); CPPUNIT_ASSERT(Model_Billsdeposits::instance().get(1)->PAYEEID == payee_supermarket->id()); - user_request->Show_InfoBarMessage("Please relocate Supermarket to Coles\n\nUse Cancel to ignore test results.\n"); + user_request->Show_InfoBarMessage("Please relocate Supermarket to Coles\n\nUse the keyboard arrow keys to access the payee: Supermarket\n\nUse Cancel to ignore test.\n"); relocatePayeeDialog dlg(m_base_frame); if (dlg.ShowModal() == wxID_OK) { This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-18 02:48:43
|
Revision: 6603 http://sourceforge.net/p/moneymanagerex/code/6603 Author: guanlisheng Date: 2014-05-18 02:48:38 +0000 (Sun, 18 May 2014) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmcheckingpanel.cpp Modified: trunk/src/mmcheckingpanel.cpp =================================================================== --- trunk/src/mmcheckingpanel.cpp 2014-05-18 01:03:25 UTC (rev 6602) +++ trunk/src/mmcheckingpanel.cpp 2014-05-18 02:48:38 UTC (rev 6603) @@ -133,7 +133,8 @@ { if (transFilterDlg_) delete transFilterDlg_; - m_frame->SetCheckingAccountPageInactive(); + if (m_frame) + m_frame->SetCheckingAccountPageInactive(); } bool mmCheckingPanel::Create( This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-18 01:03:28
|
Revision: 6602 http://sourceforge.net/p/moneymanagerex/code/6602 Author: stef145g Date: 2014-05-18 01:03:25 +0000 (Sun, 18 May 2014) Log Message: ----------- Fix: Prevent test crash, by not destroying cache before all sub-tests completed. Modified Paths: -------------- trunk/tests/test_callback_hooks.cpp Modified: trunk/tests/test_callback_hooks.cpp =================================================================== --- trunk/tests/test_callback_hooks.cpp 2014-05-17 13:44:52 UTC (rev 6601) +++ trunk/tests/test_callback_hooks.cpp 2014-05-18 01:03:25 UTC (rev 6602) @@ -83,7 +83,7 @@ void Test_Callback_Hooks::test_Init_Base_Currency() { Model_Infotable::instance(&m_test_db); - Model_Currency currency = Model_Currency::instance(&m_test_db); + Model_Currency& currency = Model_Currency::instance(&m_test_db); Model_Currency::Data* au_record = currency.GetCurrencyRecord("AUD"); int precision = currency.precision(au_record); This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-17 13:44:57
|
Revision: 6601 http://sourceforge.net/p/moneymanagerex/code/6601 Author: guanlisheng Date: 2014-05-17 13:44:52 +0000 (Sat, 17 May 2014) Log Message: ----------- fix GetCurrencyRecord Modified Paths: -------------- trunk/src/model/Model_Currency.cpp trunk/src/model/Model_Currency.h trunk/tests/db_init_model.cpp trunk/tests/test_callback_hooks.cpp trunk/tests/test_currency.cpp Modified: trunk/src/model/Model_Currency.cpp =================================================================== --- trunk/src/model/Model_Currency.cpp 2014-05-17 12:40:50 UTC (rev 6600) +++ trunk/src/model/Model_Currency.cpp 2014-05-17 13:44:52 UTC (rev 6601) @@ -129,17 +129,14 @@ Model_Infotable::instance().SetBaseCurrencyID(r->CURRENCYID); } -Model_Currency::Data Model_Currency::GetCurrencyRecord(const wxString& currency_symbol) +Model_Currency::Data* Model_Currency::GetCurrencyRecord(const wxString& currency_symbol) { - Model_Currency::Data record; - for (const auto& currency_record : Model_Currency::instance().all()) - { - if (currency_record.CURRENCY_SYMBOL == currency_symbol) - { - record = currency_record; - } - } + Model_Currency::Data* record = this->get_one(CURRENCY_SYMBOL(currency_symbol)); + if (record) return record; + Model_Currency::Data_Set items = Model_Currency::instance().find(CURRENCY_SYMBOL(currency_symbol)); + if (items.empty()) record = this->get(items[0].id(), this->db_); + return record; } Modified: trunk/src/model/Model_Currency.h =================================================================== --- trunk/src/model/Model_Currency.h 2014-05-17 12:40:50 UTC (rev 6600) +++ trunk/src/model/Model_Currency.h 2014-05-17 13:44:52 UTC (rev 6601) @@ -59,7 +59,7 @@ static void SetBaseCurrency(Data* r); /** Return the currency Data record for the given symbol */ - Model_Currency::Data GetCurrencyRecord(const wxString& currency_symbol); + Model_Currency::Data* GetCurrencyRecord(const wxString& currency_symbol); /** Add prefix and suffix characters to string value */ static wxString toCurrency(double value, const Data* currency = GetBaseCurrency(), int precision = -1); Modified: trunk/tests/db_init_model.cpp =================================================================== --- trunk/tests/db_init_model.cpp 2014-05-17 12:40:50 UTC (rev 6600) +++ trunk/tests/db_init_model.cpp 2014-05-17 13:44:52 UTC (rev 6601) @@ -129,14 +129,14 @@ void DB_Init_Model::Init_BaseCurrency(const wxString& base_currency_symbol, const wxString& user_name) { - Model_Currency::Data currency_record = Model_Currency::instance().GetCurrencyRecord(base_currency_symbol); + Model_Currency::Data* currency_record = Model_Currency::instance().GetCurrencyRecord(base_currency_symbol); if (base_currency_symbol == "AUD") { // ensure that group separator is a comma in database. - currency_record.GROUP_SEPARATOR = ","; - Model_Currency::instance().save(¤cy_record); + currency_record->GROUP_SEPARATOR = ","; + Model_Currency::instance().save(currency_record); } - Model_Currency::instance().SetBaseCurrency(¤cy_record); + Model_Currency::instance().SetBaseCurrency(currency_record); // Set database User Name Model_Infotable::instance().Set("USERNAME", user_name); mmOptions::instance().userNameString_ = user_name; @@ -162,7 +162,7 @@ int currencyID = -1; if (!currency_symbol.IsEmpty()) { - currencyID = Model_Currency::instance().GetCurrencyRecord(currency_symbol).id(); + currencyID = Model_Currency::instance().GetCurrencyRecord(currency_symbol)->id(); } else currencyID = Model_Infotable::instance().GetBaseCurrencyId(); Modified: trunk/tests/test_callback_hooks.cpp =================================================================== --- trunk/tests/test_callback_hooks.cpp 2014-05-17 12:40:50 UTC (rev 6600) +++ trunk/tests/test_callback_hooks.cpp 2014-05-17 13:44:52 UTC (rev 6601) @@ -85,12 +85,12 @@ Model_Infotable::instance(&m_test_db); Model_Currency currency = Model_Currency::instance(&m_test_db); - Model_Currency::Data au_record = currency.GetCurrencyRecord("AUD"); + Model_Currency::Data* au_record = currency.GetCurrencyRecord("AUD"); int precision = currency.precision(au_record); CPPUNIT_ASSERT(precision == 2); std::cout << "Set Base Currency: "; - currency.SetBaseCurrency(&au_record); + currency.SetBaseCurrency(au_record); } // Initialise some payees Modified: trunk/tests/test_currency.cpp =================================================================== --- trunk/tests/test_currency.cpp 2014-05-17 12:40:50 UTC (rev 6600) +++ trunk/tests/test_currency.cpp 2014-05-17 13:44:52 UTC (rev 6601) @@ -72,24 +72,24 @@ wxString value; int precision; Model_Currency& currency = Model_Currency::instance(); - Model_Currency::Data au_record = currency.GetCurrencyRecord("AUD"); + Model_Currency::Data* au_record = currency.GetCurrencyRecord("AUD"); // Check precision is 2 digits precision = currency.precision(au_record); CPPUNIT_ASSERT(precision == 2); // check database values - CPPUNIT_ASSERT(au_record.DECIMAL_POINT == "."); - CPPUNIT_ASSERT(au_record.GROUP_SEPARATOR = ","); + CPPUNIT_ASSERT(au_record->DECIMAL_POINT == "."); + CPPUNIT_ASSERT(au_record->GROUP_SEPARATOR = ","); //---------------------------------------------- value = currency.toCurrency(12345.12345); CPPUNIT_ASSERT(value == "$12,345.12"); - value = currency.toCurrency(12345.12345, &au_record); + value = currency.toCurrency(12345.12345, au_record); CPPUNIT_ASSERT(value == "$12,345.12"); - value = currency.fromString2Default("12,345.1234", &au_record); + value = currency.fromString2Default("12,345.1234", au_record); CPPUNIT_ASSERT(value == "12345.1234"); // Test precision regardless of currency to 2 digits @@ -97,38 +97,38 @@ CPPUNIT_ASSERT(value == "12,345.12"); //---------------------------------------------- - Model_Currency::Data taiwan_record = currency.GetCurrencyRecord("TWD"); + Model_Currency::Data* taiwan_record = currency.GetCurrencyRecord("TWD"); precision = currency.precision(taiwan_record); CPPUNIT_ASSERT(precision == 2); - taiwan_record.GROUP_SEPARATOR = "."; - taiwan_record.DECIMAL_POINT = ","; - taiwan_record.SFX_SYMBOL = " - MOD"; - currency.save(&taiwan_record); + taiwan_record->GROUP_SEPARATOR = "."; + taiwan_record->DECIMAL_POINT = ","; + taiwan_record->SFX_SYMBOL = " - MOD"; + currency.save(taiwan_record); - currency.SetBaseCurrency(&taiwan_record); + currency.SetBaseCurrency(taiwan_record); //---------------------------------------------- value = currency.toCurrency(12345.12345); CPPUNIT_ASSERT(value == "NT$12.345,12 - MOD"); - value = currency.fromString2Default("NT$12.345,1234 - MOD", &taiwan_record); + value = currency.fromString2Default("NT$12.345,1234 - MOD", taiwan_record); CPPUNIT_ASSERT(value == "NT$12345.1234 - MOD"); - value = currency.fromString2Default("12.345,1234", &taiwan_record); + value = currency.fromString2Default("12.345,1234", taiwan_record); CPPUNIT_ASSERT(value == "12345.1234"); value = currency.toString(12345.12345); CPPUNIT_ASSERT(value == "12.345,12"); //---------------------------------------------- - value = currency.fromString2Default("12,345.12", &au_record); + value = currency.fromString2Default("12,345.12", au_record); CPPUNIT_ASSERT(value == "12345.12"); - value = currency.toCurrency(12345.12345, &au_record); + value = currency.toCurrency(12345.12345, au_record); CPPUNIT_ASSERT(value == "$12,345.12"); - currency.SetBaseCurrency(&au_record); + currency.SetBaseCurrency(au_record); } void Test_Currency::FourDigitPrecision() @@ -138,27 +138,27 @@ int precision; Model_Currency& currency = Model_Currency::instance(); - Model_Currency::Data au_record = currency.GetCurrencyRecord("AUD"); + Model_Currency::Data* au_record = currency.GetCurrencyRecord("AUD"); // check precision of currency precision = currency.precision(au_record); CPPUNIT_ASSERT(precision == 2); - CPPUNIT_ASSERT(au_record.GROUP_SEPARATOR == ","); + CPPUNIT_ASSERT(au_record->GROUP_SEPARATOR == ","); // Test precision regardless of currency to 4 digits value = currency.toString(12345.12345, 0, 4); CPPUNIT_ASSERT(value == "12,345.1234"); - Model_Currency::Data taiwan_record = currency.GetCurrencyRecord("TWD"); + Model_Currency::Data* taiwan_record = currency.GetCurrencyRecord("TWD"); precision = currency.precision(taiwan_record); CPPUNIT_ASSERT(precision == 2); // Test precision using currency of currency to 4 digits - value = currency.toString(12345.12345, &taiwan_record, 4); + value = currency.toString(12345.12345, taiwan_record, 4); CPPUNIT_ASSERT(value == "12.345,1234"); - value = currency.toCurrency(12345.12345, &taiwan_record, 4); + value = currency.toCurrency(12345.12345, taiwan_record, 4); CPPUNIT_ASSERT(value == "NT$12.345,1234 - MOD"); } This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-17 12:40:54
|
Revision: 6600 http://sourceforge.net/p/moneymanagerex/code/6600 Author: guanlisheng Date: 2014-05-17 12:40:50 +0000 (Sat, 17 May 2014) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/mmex.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2014-05-17 03:59:29 UTC (rev 6599) +++ trunk/src/mmex.cpp 2014-05-17 12:40:50 UTC (rev 6600) @@ -28,7 +28,6 @@ #include "model/Model_Usage.h" #include "webserver.h" - #include <wx/fs_mem.h> #include <wx/fs_arc.h> #include <wx/fs_filter.h> This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-17 03:59:32
|
Revision: 6599 http://sourceforge.net/p/moneymanagerex/code/6599 Author: guanlisheng Date: 2014-05-17 03:59:29 +0000 (Sat, 17 May 2014) Log Message: ----------- fix test case and disable asserts Modified Paths: -------------- trunk/tests/cpu_timer.cpp trunk/tests/db_init_model.cpp trunk/tests/mmex_tests.cpp trunk/tests/test_assets.cpp trunk/tests/test_currency.cpp Modified: trunk/tests/cpu_timer.cpp =================================================================== --- trunk/tests/cpu_timer.cpp 2014-05-17 01:44:06 UTC (rev 6598) +++ trunk/tests/cpu_timer.cpp 2014-05-17 03:59:29 UTC (rev 6599) @@ -27,5 +27,5 @@ CpuTimer::~CpuTimer() { - std::cout << wxString::Format("\n %.5d ms for: %s", m_start.Time(), m_message.c_str()).char_str(); + std::cout << wxString::Format("\n %.5ld ms for: %s", m_start.Time(), m_message.c_str()).char_str(); } Modified: trunk/tests/db_init_model.cpp =================================================================== --- trunk/tests/db_init_model.cpp 2014-05-17 01:44:06 UTC (rev 6598) +++ trunk/tests/db_init_model.cpp 2014-05-17 03:59:29 UTC (rev 6599) @@ -101,6 +101,8 @@ mmOptions::instance().LoadInfotableOptions(); Model_Asset::instance(test_db); + Model_Currency::instance(test_db); + Model_Attachment::instance(test_db); } void DB_Init_Model::Init_Model_Stocks(wxSQLite3Database* test_db) Modified: trunk/tests/mmex_tests.cpp =================================================================== --- trunk/tests/mmex_tests.cpp 2014-05-17 01:44:06 UTC (rev 6598) +++ trunk/tests/mmex_tests.cpp 2014-05-17 03:59:29 UTC (rev 6599) @@ -18,6 +18,7 @@ ********************************************************/ #include <wx/app.h> +#include <wx/debug.h> #include <cppunit/BriefTestProgressListener.h> #include <cppunit/CompilerOutputter.h> #include <cppunit/extensions/TestFactoryRegistry.h> @@ -47,6 +48,8 @@ return -1; } + wxDisableAsserts(); + // Create the event manager and test controller CPPUNIT_NS::TestResult controller; Modified: trunk/tests/test_assets.cpp =================================================================== --- trunk/tests/test_assets.cpp 2014-05-17 01:44:06 UTC (rev 6598) +++ trunk/tests/test_assets.cpp 2014-05-17 03:59:29 UTC (rev 6599) @@ -67,6 +67,7 @@ m_dbmodel = new DB_Init_Model(); m_dbmodel->Init_Model_Assets(&m_test_db); + m_dbmodel->Init_BaseCurrency(); } void Test_Asset::tearDown() Modified: trunk/tests/test_currency.cpp =================================================================== --- trunk/tests/test_currency.cpp 2014-05-17 01:44:06 UTC (rev 6598) +++ trunk/tests/test_currency.cpp 2014-05-17 03:59:29 UTC (rev 6599) @@ -71,7 +71,7 @@ CpuTimer time_this; wxString value; int precision; - Model_Currency currency = Model_Currency::instance(); + Model_Currency& currency = Model_Currency::instance(); Model_Currency::Data au_record = currency.GetCurrencyRecord("AUD"); // Check precision is 2 digits @@ -137,7 +137,7 @@ wxString value; int precision; - Model_Currency currency = Model_Currency::instance(); + Model_Currency& currency = Model_Currency::instance(); Model_Currency::Data au_record = currency.GetCurrencyRecord("AUD"); // check precision of currency This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-17 01:44:11
|
Revision: 6598 http://sourceforge.net/p/moneymanagerex/code/6598 Author: stef145g Date: 2014-05-17 01:44:06 +0000 (Sat, 17 May 2014) Log Message: ----------- removal of non working msw-vc-2013e test build files Removed Paths: ------------- trunk/build/msw-vc-2013e/tests/ This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-17 01:32:38
|
Revision: 6597 http://sourceforge.net/p/moneymanagerex/code/6597 Author: stef145g Date: 2014-05-17 01:32:33 +0000 (Sat, 17 May 2014) Log Message: ----------- Rebuilt msw_tests-vc-2013e using new msw_test structure. Modified Paths: -------------- trunk/setup/win/update_mmex_build_files.bat trunk/tests/test_database_initialisation.cpp Added Paths: ----------- trunk/build/msw_tests-vc-2013e/ trunk/build/msw_tests-vc-2013e/mmex_tests.sln trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj.filters trunk/build/msw_tests-vc-2013e/mmex_tests_lua.vcxproj trunk/build/msw_tests-vc-2013e/mmex_tests_lua.vcxproj.filters trunk/build/msw_tests-vc-2013e/mmex_tests_mmex_tests.vcxproj trunk/build/msw_tests-vc-2013e/mmex_tests_mmex_tests.vcxproj.filters trunk/build/msw_tests-vc-2013e/mmex_tests_wxsqlite.vcxproj trunk/build/msw_tests-vc-2013e/mmex_tests_wxsqlite.vcxproj.filters Index: trunk/build/msw_tests-vc-2013e =================================================================== --- trunk/build/msw_tests-vc-2013e 2014-05-16 15:45:03 UTC (rev 6596) +++ trunk/build/msw_tests-vc-2013e 2014-05-17 01:32:33 UTC (rev 6597) Property changes on: trunk/build/msw_tests-vc-2013e ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,7 ## +*.sdf +*.opensdf +*.suo +*.mmb +*.emb +Win32 +x64 Added: trunk/build/msw_tests-vc-2013e/mmex_tests.sln =================================================================== --- trunk/build/msw_tests-vc-2013e/mmex_tests.sln (rev 0) +++ trunk/build/msw_tests-vc-2013e/mmex_tests.sln 2014-05-17 01:32:33 UTC (rev 6597) @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxsqlite", "mmex_tests_wxsqlite.vcxproj", "{05486C1A-D087-50A3-9670-0AE3D19887CD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "mmex_tests_lua.vcxproj", "{38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "mmex_tests_cppunit.vcxproj", "{C625FFD9-6E76-569F-92BB-DEB3A6A647C5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmex_tests", "mmex_tests_mmex_tests.vcxproj", "{41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Debug|Win32.ActiveCfg = Debug|Win32 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Debug|Win32.Build.0 = Debug|Win32 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Debug|x64.ActiveCfg = Debug|x64 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Debug|x64.Build.0 = Debug|x64 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Release|Win32.ActiveCfg = Release|Win32 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Release|Win32.Build.0 = Release|Win32 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Release|x64.ActiveCfg = Release|x64 + {05486C1A-D087-50A3-9670-0AE3D19887CD}.Release|x64.Build.0 = Release|x64 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Debug|Win32.ActiveCfg = Debug|Win32 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Debug|Win32.Build.0 = Debug|Win32 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Debug|x64.ActiveCfg = Debug|x64 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Debug|x64.Build.0 = Debug|x64 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Release|Win32.ActiveCfg = Release|Win32 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Release|Win32.Build.0 = Release|Win32 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Release|x64.ActiveCfg = Release|x64 + {38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}.Release|x64.Build.0 = Release|x64 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Debug|Win32.ActiveCfg = Debug|Win32 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Debug|Win32.Build.0 = Debug|Win32 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Debug|x64.ActiveCfg = Debug|x64 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Debug|x64.Build.0 = Debug|x64 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Release|Win32.ActiveCfg = Release|Win32 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Release|Win32.Build.0 = Release|Win32 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Release|x64.ActiveCfg = Release|x64 + {C625FFD9-6E76-569F-92BB-DEB3A6A647C5}.Release|x64.Build.0 = Release|x64 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Debug|Win32.ActiveCfg = Debug|Win32 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Debug|Win32.Build.0 = Debug|Win32 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Debug|x64.ActiveCfg = Debug|x64 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Debug|x64.Build.0 = Debug|x64 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Release|Win32.ActiveCfg = Release|Win32 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Release|Win32.Build.0 = Release|Win32 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Release|x64.ActiveCfg = Release|x64 + {41FC52EC-2DA2-5289-AB6A-BB921FCA4B7D}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Property changes on: trunk/build/msw_tests-vc-2013e/mmex_tests.sln ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Added: trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj =================================================================== --- trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj (rev 0) +++ trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj 2014-05-17 01:32:33 UTC (rev 6597) @@ -0,0 +1,351 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>cppunit</ProjectName> + <ProjectGuid>{C625FFD9-6E76-569F-92BB-DEB3A6A647C5}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\cppunit\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\cppunit\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\cppunit\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\cppunit\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\cppunit\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\cppunit.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat /> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\cppunit.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_cppunit.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\cppunit\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\cppunit.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\cppunit.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_cppunit.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\cppunit\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\cppunit.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat /> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;_UNICODE;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\cppunit.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_cppunit.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\cppunit\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\cppunit.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;_DEBUG;_UNICODE;__WXDEBUG__;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\cppunit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\cppunit.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_cppunit.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\AdditionalMessage.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Asserter.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\BeOsDynamicLibraryManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\BriefTestProgressListener.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\CompilerOutputter.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DefaultProtector.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DynamicLibraryManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DynamicLibraryManagerException.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Exception.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Message.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\PlugInManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\PlugInParameters.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Protector.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\ProtectorChain.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\RepeatedTest.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\ShlDynamicLibraryManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\SourceLine.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\StringTools.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\SynchronizedObject.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Test.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestAssert.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestCase.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestCaseDecorator.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestComposite.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestDecorator.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestFactoryRegistry.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestFailure.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestLeaf.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestNamer.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestPath.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestPlugInDefaultImpl.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestResult.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestResultCollector.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestRunner.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSetUp.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuccessListener.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuite.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuiteBuilderContext.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextOutputter.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestProgressListener.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestResult.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestRunner.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TypeInfoHelper.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\UnixDynamicLibraryManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Win32DynamicLibraryManager.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlDocument.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlElement.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlOutputter.cpp" /> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlOutputterHook.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\AdditionalMessage.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\Algorithm.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Asserter.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\AutoRegisterSuite.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\BriefTestProgressListener.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\CompilerOutputter.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\CppUnitApi.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitDeque.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitMap.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitSet.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitStack.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitVector.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\DynamicLibraryManager.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\DynamicLibraryManagerException.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Exception.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\ExceptionTestCaseDecorator.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\FloatingPoint.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\HelperMacros.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Message.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\Orthodox.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Outputter.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\PlugInManager.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\PlugInParameters.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Portability.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Protector.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\RepeatedTest.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\SelectDllLoader.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\SourceLine.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\SourcePrefix.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\Stream.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\StringTools.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\SynchronizedObject.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Test.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestAssert.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestCaller.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestCase.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestCaseDecorator.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestComposite.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestDecorator.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFactory.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFactoryRegistry.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestFailure.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestFixture.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFixtureFactory.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestLeaf.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestListener.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestNamer.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestPath.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\TestPlugIn.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\TestPlugInDefaultImpl.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestResult.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestResultCollector.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestRunner.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\ui\text\TestRunner.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSetUp.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestSuccessListener.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestSuite.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSuiteBuilderContext.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSuiteFactory.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextOutputter.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestProgressListener.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestResult.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestRunner.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\ui\text\TextTestRunner.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TypeInfoHelper.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\XmlDocument.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\XmlElement.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\XmlInputHelper.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\XmlOutputter.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\XmlOutputterHook.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-bcb5.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-evc4.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-mac.h" /> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-msvc6.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Property changes on: trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Added: trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj.filters =================================================================== --- trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj.filters (rev 0) +++ trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj.filters 2014-05-17 01:32:33 UTC (rev 6597) @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\AdditionalMessage.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Asserter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\BeOsDynamicLibraryManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\BriefTestProgressListener.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\CompilerOutputter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DefaultProtector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DynamicLibraryManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\DynamicLibraryManagerException.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Exception.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Message.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\PlugInManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\PlugInParameters.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Protector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\ProtectorChain.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\RepeatedTest.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\ShlDynamicLibraryManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\SourceLine.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\StringTools.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\SynchronizedObject.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Test.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestAssert.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestCase.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestCaseDecorator.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestComposite.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestDecorator.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestFactoryRegistry.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestFailure.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestLeaf.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestNamer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestPath.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestPlugInDefaultImpl.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestResult.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestResultCollector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestRunner.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSetUp.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuccessListener.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuite.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TestSuiteBuilderContext.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextOutputter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestProgressListener.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestResult.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TextTestRunner.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\TypeInfoHelper.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\UnixDynamicLibraryManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\Win32DynamicLibraryManager.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlDocument.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlElement.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlOutputter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\lib\cppunit\src\cppunit\XmlOutputterHook.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\AdditionalMessage.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\Algorithm.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Asserter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\AutoRegisterSuite.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\BriefTestProgressListener.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\CompilerOutputter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\CppUnitApi.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitDeque.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitMap.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitSet.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitStack.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\CppUnitVector.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\DynamicLibraryManager.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\DynamicLibraryManagerException.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Exception.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\ExceptionTestCaseDecorator.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\FloatingPoint.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\HelperMacros.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Message.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\Orthodox.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Outputter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\PlugInManager.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\PlugInParameters.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Portability.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Protector.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\RepeatedTest.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\SelectDllLoader.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\SourceLine.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\SourcePrefix.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\portability\Stream.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\StringTools.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\SynchronizedObject.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\Test.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestAssert.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestCaller.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestCase.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestCaseDecorator.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestComposite.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestDecorator.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFactory.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFactoryRegistry.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestFailure.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestFixture.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestFixtureFactory.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestLeaf.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestListener.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestNamer.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestPath.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\TestPlugIn.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\plugin\TestPlugInDefaultImpl.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestResult.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestResultCollector.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestRunner.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\ui\text\TestRunner.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSetUp.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestSuccessListener.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TestSuite.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSuiteBuilderContext.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TestSuiteFactory.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextOutputter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestProgressListener.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestResult.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\TextTestRunner.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\ui\text\TextTestRunner.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\TypeInfoHelper.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\XmlDocument.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\tools\XmlElement.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\extensions\XmlInputHelper.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\XmlOutputter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\XmlOutputterHook.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-bcb5.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-evc4.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-mac.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\lib\cppunit\include\cppunit\config\config-msvc6.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Property changes on: trunk/build/msw_tests-vc-2013e/mmex_tests_cppunit.vcxproj.filters ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +CRLF \ No newline at end of property Added: trunk/build/msw_tests-vc-2013e/mmex_tests_lua.vcxproj =================================================================== --- trunk/build/msw_tests-vc-2013e/mmex_tests_lua.vcxproj (rev 0) +++ trunk/build/msw_tests-vc-2013e/mmex_tests_lua.vcxproj 2014-05-17 01:32:33 UTC (rev 6597) @@ -0,0 +1,270 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>lua</ProjectName> + <ProjectGuid>{38DCDCB4-81BD-5EB5-8E6C-4CDF96CFFDB2}</ProjectGuid> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v120</PlatformToolset> + <UseOfMfc>false</UseOfMfc> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\lua\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\lua\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\lua\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(Platform)\$(Configuration)\</OutDir> + <IntDir>$(Platform)\$(Configuration)\lua\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\lua\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\lua.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat /> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\lua.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_lua.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\lua\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\lua.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\lua.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_lua.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\lua\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\lua.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat /> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\lua.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_lua.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Midl> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </Midl> + <ClCompile> + <AdditionalOptions>/MP /D_CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_LIB;_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ExceptionHandling>Sync</ExceptionHandling> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BufferSecurityCheck>true</BufferSecurityCheck> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <ObjectFileName>$(Platform)\$(Configuration)\lua\</ObjectFileName> + <ProgramDataBaseFileName>$(Platform)\$(Configuration)\lua.pdb</ProgramDataBaseFileName> + <WarningLevel>Level4</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <OutputFile>$(Platform)\$(Configuration)\lua.lib</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + <Bscmake> + <OutputFile>$(Platform)\$(Configuration)\mmex_tests_lua.bsc</OutputFile> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Bscmake> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\lib\lua\src\lapi.c" /> + <ClCompile Include="..\..\lib\lua\src\lauxlib.c" /> + <ClCompile Include="..\..\lib\lua\src\lbaselib.c" /> + <ClCompile Include="..\..\lib\lua\src\lbitlib.c" /> + <ClCompile Include="..\..\lib\lua\src\lcode.c" /> + <ClCompile Include="..\..\lib\lua\src\lcorolib.c" /> + <ClCompile Include="..\..\lib\lua\src\lctype.c" /> + <ClCompile Include="..\..\lib\lua\src\ldblib.c" /> + <ClCompile Include="..\..\lib\lua\src\ldebug.c" /> + <ClCompile Include="..\..\lib\lua\src\ldo.c" /> + <ClCompile Include="..\..\lib\lua\src\ldump.c" /> + <ClCompile Include="..\..\lib\lua\src\lfunc.c" /> + <ClCompile Include="..\..\lib\lua\src\lgc.c" /> + <ClCompile Include="..\..\lib\lua\src\linit.c" /> + <ClCompile Include="..\..\lib\lua\src\liolib.c" /> + <ClCompile Include="..\..\lib\lua\src\llex.c" /> + <ClCompile Include="..\..\lib\lua\src\lmathlib.c" /> + <ClCompile Include="..\..\lib\lua\src\lmem.c" /> + <ClCompile Include="..\..\lib\lua\src\loadlib.c" /> + <ClCompile Include="..\..\lib\lua\src\lobject.c" /> + <ClCompile Include="..\..\lib\lua\src\lopcodes.c" /> + <ClCompile Include="..\..\lib\lua\src\loslib.c" /> + <ClCompile Include="..\..\lib\lua\src\lparser.c" /> + <ClCompile Include="..\..\lib\lua\src\lstate.c" /> + <ClCompile Include="..\..\lib\lua\src\lstring.c" /> + <ClCompile Include="..\..\lib\lua\src\lstrlib.c" /> + <ClCompile Include="..\..\lib\lua\src\ltable.c" /> + <ClCompile Include="..\..\lib\lua\src\ltablib.c" /> + <ClCompile Include="..\..\lib\lua\src\ltm.c" /> + <ClCompile Include="..\..\lib\lua\src\lua.c" /> + <ClCompile Include="..\..\lib\lua\src\luac.c" /> + <ClCompile Include="..\..\lib\lua\src\lundump.c" /> + <ClCompile Include="..\..\lib\lua\src\lvm.c" /> + <ClCompile Include="..\..\lib\lua\src\lzio.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\lib\lua\src\lapi.h" /> + <ClInclude Include="..\..\lib\lua\src\lauxlib.h" /> + <ClInclude Include="..\..\lib\lua\src\lcode.h" /> + <ClInclude Include="..\..\lib\lua\src\lctype.h" /> + <ClInclude Include="..\..\lib\lua\src\ld... [truncated message content] |
From: <ste...@us...> - 2014-05-16 15:45:07
|
Revision: 6596 http://sourceforge.net/p/moneymanagerex/code/6596 Author: stef145g Date: 2014-05-16 15:45:03 +0000 (Fri, 16 May 2014) Log Message: ----------- Fix build files for msw_tests Modified Paths: -------------- trunk/build/bakefiles/Bakefiles.bkgen trunk/build/bakefiles/mmex_tests.bkl Added Paths: ----------- trunk/build/msw_tests/ trunk/build/msw_tests/makefile.gcc trunk/build/msw_tests/makefile.vc trunk/build/msw_tests/mmex_tests.sln trunk/build/msw_tests/mmex_tests_cppunit.vcproj trunk/build/msw_tests/mmex_tests_lua.vcproj trunk/build/msw_tests/mmex_tests_mmex_tests.vcproj trunk/build/msw_tests/mmex_tests_wxsqlite.vcproj Removed Paths: ------------- trunk/build/msw/tests/ Modified: trunk/build/bakefiles/Bakefiles.bkgen =================================================================== --- trunk/build/bakefiles/Bakefiles.bkgen 2014-05-16 15:03:55 UTC (rev 6595) +++ trunk/build/bakefiles/Bakefiles.bkgen 2014-05-16 15:45:03 UTC (rev 6596) @@ -62,15 +62,15 @@ </add-flags> <add-flags files="mmex_tests.bkl" formats="mingw"> - -o../msw/tests/makefile.gcc + -o../msw_tests/makefile.gcc </add-flags> <add-flags files="mmex_tests.bkl" formats="msvc"> - -o../msw/tests/makefile.vc + -o../msw_tests/makefile.vc </add-flags> <add-flags files="mmex_tests.bkl" formats="msvs2008prj"> - -o../msw/tests/mmex_tests.sln + -o../msw_tests/mmex_tests.sln -DMSVS_PLATFORMS=win32,win64 </add-flags> Modified: trunk/build/bakefiles/mmex_tests.bkl =================================================================== --- trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 15:03:55 UTC (rev 6595) +++ trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 15:45:03 UTC (rev 6596) @@ -10,7 +10,7 @@ <makefile> <!-- Default root of sources is dir where output script will be created. - autoconf generates Makefile in trunk/mmex/tests but others in trunk/mmex/build/msw/tests. + autoconf generates Makefile in trunk/mmex/tests but others in trunk/mmex/build/msw_tests. --> <if cond="FORMAT=='autoconf'"> <set-srcdir>..</set-srcdir> @@ -24,7 +24,7 @@ <include file="common.bkl"/> <include file="cppunit.bkl"/> - <!-- unit tests console application --> + <!-- MoneyManagerEx Tests Console Application --> <exe id="mmex_tests" template="mmex_common"> @@ -38,10 +38,13 @@ <!-- IMPLEMENT_APP(mmGUIApp) in mmex.cpp defines main() on Unixes, see wx\app.h. But mmex_tests.cpp also defines main(). --> - <define>wxIMPLEMENT_WXWIN_MAIN=</define> - <!-- relative to trunk/mmex --> + <if cond="FORMAT!='msvs2008prj'"> + <define>wxIMPLEMENT_WXWIN_MAIN=</define> + </if> + <!-- relative to svn/trunk --> + <set var="SRC">tests</set> <headers>$(fileList(SRC + '/*.h'))</headers> Added: trunk/build/msw_tests/makefile.gcc =================================================================== --- trunk/build/msw_tests/makefile.gcc (rev 0) +++ trunk/build/msw_tests/makefile.gcc 2014-05-16 15:45:03 UTC (rev 6596) @@ -0,0 +1,1009 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.9 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +COMPILER_PREFIX = gcc +WXSQLITE_CFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -DNOPCH \ + -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ + -DWXSQLITE3_HAVE_METADATA -I..\..\lib\wxsqlite3\sqlite3\secure\src \ + -I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) +WXSQLITE_CXXFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -DNOPCH \ + -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \ + -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ + -DWXSQLITE3_HAVE_METADATA -I..\..\lib\wxsqlite3\sqlite3\secure\src \ + -I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CXXFLAGS) +WXSQLITE_OBJECTS = \ + wxsqlite_wxsqlite3.o \ + wxsqlite_sqlite3secure.o +LUA_CFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(__DEBUG_DEFINE_p) $(CPPFLAGS) $(CFLAGS) +LUA_OBJECTS = \ + lua_lapi.o \ + lua_lauxlib.o \ + lua_lbaselib.o \ + lua_lbitlib.o \ + lua_lcode.o \ + lua_lcorolib.o \ + lua_lctype.o \ + lua_ldblib.o \ + lua_ldebug.o \ + lua_ldo.o \ + lua_ldump.o \ + lua_lfunc.o \ + lua_lgc.o \ + lua_linit.o \ + lua_liolib.o \ + lua_llex.o \ + lua_lmathlib.o \ + lua_lmem.o \ + lua_loadlib.o \ + lua_lobject.o \ + lua_lopcodes.o \ + lua_loslib.o \ + lua_lparser.o \ + lua_lstate.o \ + lua_lstring.o \ + lua_lstrlib.o \ + lua_ltable.o \ + lua_ltablib.o \ + lua_ltm.o \ + lua_lua.o \ + lua_luac.o \ + lua_lundump.o \ + lua_lvm.o \ + lua_lzio.o +CPPUNIT_CXXFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ + $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ + -I..\..\lib\cppunit\include $(CPPFLAGS) $(CXXFLAGS) +CPPUNIT_OBJECTS = \ + cppunit_AdditionalMessage.o \ + cppunit_Asserter.o \ + cppunit_BeOsDynamicLibraryManager.o \ + cppunit_BriefTestProgressListener.o \ + cppunit_CompilerOutputter.o \ + cppunit_Exception.o \ + cppunit_Message.o \ + cppunit_PlugInManager.o \ + cppunit_PlugInParameters.o \ + cppunit_Protector.o \ + cppunit_ProtectorChain.o \ + cppunit_RepeatedTest.o \ + cppunit_ShlDynamicLibraryManager.o \ + cppunit_SourceLine.o \ + cppunit_StringTools.o \ + cppunit_SynchronizedObject.o \ + cppunit_Test.o \ + cppunit_TestAssert.o \ + cppunit_TestCase.o \ + cppunit_TestCaseDecorator.o \ + cppunit_TestComposite.o \ + cppunit_TestDecorator.o \ + cppunit_TestFactoryRegistry.o \ + cppunit_TestFailure.o \ + cppunit_TestLeaf.o \ + cppunit_TestNamer.o \ + cppunit_TestPath.o \ + cppunit_TestPlugInDefaultImpl.o \ + cppunit_TestResult.o \ + cppunit_TestResultCollector.o \ + cppunit_TestRunner.o \ + cppunit_TestSetUp.o \ + cppunit_TestSuccessListener.o \ + cppunit_TestSuite.o \ + cppunit_TestSuiteBuilderContext.o \ + cppunit_TextOutputter.o \ + cppunit_TextTestProgressListener.o \ + cppunit_TextTestResult.o \ + cppunit_TextTestRunner.o \ + cppunit_TypeInfoHelper.o \ + cppunit_UnixDynamicLibraryManager.o \ + cppunit_Win32DynamicLibraryManager.o \ + cppunit_XmlDocument.o \ + cppunit_XmlElement.o \ + cppunit_XmlOutputter.o \ + cppunit_XmlOutputterHook.o \ + cppunit_DefaultProtector.o \ + cppunit_DynamicLibraryManager.o \ + cppunit_DynamicLibraryManagerException.o +MMEX_TESTS_CFLAGS = -DHAVE_W32API_H $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -mthreads -W \ + -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ + -I..\..\lib\wxsqlite3\sqlite3\secure\src -I..\..\lib\wxsqlite3\include \ + -I..\..\lib\lua\src -I..\..\lib -I..\..\3rd -I..\..\3rd\LuaGlue\include \ + -I..\..\3rd\cgitemplate -I..\..\3rd\csv-parser\include -I..\..\src -DNOPCH \ + -I..\..\src -I..\..\lib\cppunit\include -DwxIMPLEMENT_WXWIN_MAIN= \ + $(CPPFLAGS) $(CFLAGS) +MMEX_TESTS_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -mthreads -W \ + -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ + -I..\..\lib\wxsqlite3\sqlite3\secure\src -I..\..\lib\wxsqlite3\include \ + -I..\..\lib\lua\src -I..\..\lib -I..\..\3rd -I..\..\3rd\LuaGlue\include \ + -I..\..\3rd\cgitemplate -I..\..\3rd\csv-parser\include -I..\..\src -DNOPCH \ + -I..\..\src -I..\..\lib\cppunit\include -DwxIMPLEMENT_WXWIN_MAIN= \ + $(CPPFLAGS) $(CXXFLAGS) +MMEX_TESTS_OBJECTS = \ + mmex_tests_aboutdialog.o \ + mmex_tests_accountdialog.o \ + mmex_tests_appstartdialog.o \ + mmex_tests_assetdialog.o \ + mmex_tests_assetspanel.o \ + mmex_tests_attachmentdialog.o \ + mmex_tests_billsdepositsdialog.o \ + mmex_tests_billsdepositspanel.o \ + mmex_tests_budgetentrydialog.o \ + mmex_tests_budgetingpanel.o \ + mmex_tests_budgetyeardialog.o \ + mmex_tests_budgetyearentrydialog.o \ + mmex_tests_categdialog.o \ + mmex_tests_constants.o \ + mmex_tests_currencydialog.o \ + mmex_tests_dbwrapper.o \ + mmex_tests_filtertransdialog.o \ + mmex_tests_general_report_manager.o \ + mmex_tests_images_list.o \ + mmex_tests_maincurrencydialog.o \ + mmex_tests_minimal_editor.o \ + mmex_tests_mmCalculator.o \ + mmex_tests_mmOption.o \ + mmex_tests_mmcheckingpanel.o \ + mmex_tests_mmex.o \ + mmex_tests_mmframe.o \ + mmex_tests_mmhelppanel.o \ + mmex_tests_mmhomepagepanel.o \ + mmex_tests_mmreportspanel.o \ + mmex_tests_optionsdialog.o \ + mmex_tests_paths.o \ + mmex_tests_payeedialog.o \ + mmex_tests_recentfiles.o \ + mmex_tests_relocatecategorydialog.o \ + mmex_tests_relocatepayeedialog.o \ + mmex_tests_splitdetailsdialog.o \ + mmex_tests_splittransactionsdialog.o \ + mmex_tests_stockdialog.o \ + mmex_tests_stockspanel.o \ + mmex_tests_transdialog.o \ + mmex_tests_util.o \ + mmex_tests_webapp.o \ + mmex_tests_webserver.o \ + mmex_tests_wizard_newaccount.o \ + mmex_tests_wizard_newdb.o \ + mmex_tests_budget.o \ + mmex_tests_budgetcategorysummary.o \ + mmex_tests_budgetingperf.o \ + mmex_tests_cashflow.o \ + mmex_tests_categexp.o \ + mmex_tests_categovertimeperf.o \ + mmex_tests_chart.o \ + mmex_tests_html_widget_bills_and_deposits.o \ + mmex_tests_html_widget_stocks.o \ + mmex_tests_html_widget_top_categories.o \ + mmex_tests_htmlbuilder.o \ + mmex_tests_incexpenses.o \ + mmex_tests_mmDateRange.o \ + mmex_tests_mmgraphgenerator.o \ + mmex_tests_mmgraphincexpensesmonth.o \ + mmex_tests_mmgraphpie.o \ + mmex_tests_mmgraphtopcategories.o \ + mmex_tests_payee.o \ + mmex_tests_reportbase.o \ + mmex_tests_transactions.o \ + mmex_tests_platfdep.o \ + mmex_tests_export.o \ + mmex_tests_qif_export.o \ + mmex_tests_qif_import.o \ + mmex_tests_qif_import_gui.o \ + mmex_tests_univcsvdialog.o \ + mmex_tests_Model_Account.o \ + mmex_tests_Model_Asset.o \ + mmex_tests_Model_Attachment.o \ + mmex_tests_Model_Billsdeposits.o \ + mmex_tests_Model_Budget.o \ + mmex_tests_Model_Budgetsplittransaction.o \ + mmex_tests_Model_Budgetyear.o \ + mmex_tests_Model_Category.o \ + mmex_tests_Model_Checking.o \ + mmex_tests_Model_Currency.o \ + mmex_tests_Model_Infotable.o \ + mmex_tests_Model_Payee.o \ + mmex_tests_Model_Report.o \ + mmex_tests_Model_Setting.o \ + mmex_tests_Model_Splittransaction.o \ + mmex_tests_Model_Stock.o \ + mmex_tests_Model_Subcategory.o \ + mmex_tests_Model_Usage.o \ + mmex_tests_html_template.o \ + mmex_tests_mongoose.o \ + mmex_tests_csv_parser.o \ + mmex_tests_cpu_timer.o \ + mmex_tests_db_init_model.o \ + mmex_tests_framebase_tests.o \ + mmex_tests_mmex_tests.o \ + mmex_tests_test_about_dialog.o \ + mmex_tests_test_assets.o \ + mmex_tests_test_billsdeposits.o \ + mmex_tests_test_callback_hooks.o \ + mmex_tests_test_checking.o \ + mmex_tests_test_currency.o \ + mmex_tests_test_database_initialisation.o \ + mmex_tests_test_date_range.o \ + mmex_tests_test_filtertrans_dialog.o \ + mmex_tests_test_relocate_category.o \ + mmex_tests_test_relocate_payee.o \ + mmex_tests_test_stocks.o \ + mmex_tests_mmex_tests_rc.o + +### Conditionally set variables: ### + +ifeq ($(WX_DEBUG),1) +WX3RDPARTYLIBPOSTFIX = d +endif +ifeq ($(WX_SHARED),0) +____WX_SHARED_27_p_1 = +endif +ifeq ($(WX_SHARED),1) +____WX_SHARED_27_p_1 = --define WXUSINGDLL +endif +ifeq ($(WX_UNICODE),1) +__WXUNICODE_DEFINE_p_3 = --define _UNICODE +endif +ifeq ($(WX_DEBUG),1) +__WXDEBUG_DEFINE_p_3 = --define __WXDEBUG__ +endif +ifeq ($(WX_SHARED),0) +____mmex_tests_LIB_SUF_FILENAMES = _lib +endif +ifeq ($(WX_SHARED),1) +____mmex_tests_LIB_SUF_FILENAMES = _dll +endif +ifeq ($(WX_DEBUG),0) +__DEBUG_DEFINE_p_4 = --define NDEBUG +endif +ifeq ($(WX_DEBUG),1) +__DEBUG_DEFINE_p_4 = --define _DEBUG +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_QA_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_qa +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_AUI_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_aui +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_STC_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_WEBVIEW_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_webview +endif +ifeq ($(WX_MONOLITHIC),0) +__WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) +endif +ifeq ($(WX_MONOLITHIC),1) +__WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX) +endif +ifeq ($(WX_DEBUG),0) +__OPTIMIZEFLAG = -O2 +endif +ifeq ($(WX_DEBUG),1) +__OPTIMIZEFLAG = -O0 +endif +ifeq ($(WX_DEBUG),0) +__DEBUG_DEFINE_p = -DNDEBUG +endif +ifeq ($(WX_DEBUG),1) +__DEBUG_DEFINE_p = -D_DEBUG +endif +ifeq ($(WX_SHARED),0) +____WX_SHARED = +endif +ifeq ($(WX_SHARED),1) +____WX_SHARED = -DWXUSINGDLL +endif +ifeq ($(WX_UNICODE),1) +__WXUNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(WX_DEBUG),1) +__WXDEBUG_DEFINE_p = -D__WXDEBUG__ +endif +ifeq ($(WX_DEBUG),0) +ifeq ($(WX_UNICODE),1) +WXLIBPOSTFIX = u +endif +endif +ifeq ($(WX_DEBUG),1) +ifeq ($(WX_UNICODE),0) +WXLIBPOSTFIX = d +endif +endif +ifeq ($(WX_DEBUG),1) +ifeq ($(WX_UNICODE),1) +WXLIBPOSTFIX = ud +endif +endif +ifeq ($(WX_SHARED),0) +WXLIBPATH = \lib\$(COMPILER_PREFIX)_lib +endif +ifeq ($(WX_SHARED),1) +WXLIBPATH = \lib\$(COMPILER_PREFIX)_dll +endif +ifeq ($(WX_DEBUG),0) +__DEBUGINFO = +endif +ifeq ($(WX_DEBUG),1) +__DEBUGINFO = -g +endif + + +### Targets: ### + +all: test_for_selected_wxbuild libwxsqlite.a liblua.a libcppunit.a mmex_tests.exe + +install: + +uninstall: + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + -if exist libwxsqlite.a del libwxsqlite.a + -if exist liblua.a del liblua.a + -if exist libcppunit.a del libcppunit.a + -if exist mmex_tests.exe del mmex_tests.exe + +test_for_selected_wxbuild: + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo The selected wxWidgets build is not available! + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo Please use the options prefixed with WX_ to select another wxWidgets build. + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + exit 1 + +libwxsqlite.a: $(WXSQLITE_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(WXSQLITE_OBJECTS) + ranlib $@ + +liblua.a: $(LUA_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(LUA_OBJECTS) + ranlib $@ + +libcppunit.a: $(CPPUNIT_OBJECTS) + if exist $@ del $@ + ar rcu $@ $(CPPUNIT_OBJECTS) + ranlib $@ + +mmex_tests.exe: $(MMEX_TESTS_OBJECTS) libwxsqlite.a liblua.a libcppunit.a mmex_tests_mmex_tests_rc.o + $(CXX) -o $@ $(MMEX_TESTS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -L$(WX_DIR)\lib\gcc$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads $(__DEBUGINFO) $(LDFLAGS) libwxsqlite.a liblua.a $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 libcppunit.a + +check: all + .\mmex_tests.exe + +wxsqlite_wxsqlite3.o: ../../lib/wxsqlite3/src/wxsqlite3.cpp + $(CXX) -c -o $@ $(WXSQLITE_CXXFLAGS) $(CPPDEPS) $< + +wxsqlite_sqlite3secure.o: ../../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c + $(CC) -c -o $@ $(WXSQLITE_CFLAGS) $(CPPDEPS) $< + +lua_lapi.o: ../../lib/lua/src/lapi.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lauxlib.o: ../../lib/lua/src/lauxlib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lbaselib.o: ../../lib/lua/src/lbaselib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lbitlib.o: ../../lib/lua/src/lbitlib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lcode.o: ../../lib/lua/src/lcode.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lcorolib.o: ../../lib/lua/src/lcorolib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lctype.o: ../../lib/lua/src/lctype.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ldblib.o: ../../lib/lua/src/ldblib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ldebug.o: ../../lib/lua/src/ldebug.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ldo.o: ../../lib/lua/src/ldo.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ldump.o: ../../lib/lua/src/ldump.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lfunc.o: ../../lib/lua/src/lfunc.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lgc.o: ../../lib/lua/src/lgc.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_linit.o: ../../lib/lua/src/linit.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_liolib.o: ../../lib/lua/src/liolib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_llex.o: ../../lib/lua/src/llex.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lmathlib.o: ../../lib/lua/src/lmathlib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lmem.o: ../../lib/lua/src/lmem.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_loadlib.o: ../../lib/lua/src/loadlib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lobject.o: ../../lib/lua/src/lobject.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lopcodes.o: ../../lib/lua/src/lopcodes.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_loslib.o: ../../lib/lua/src/loslib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lparser.o: ../../lib/lua/src/lparser.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lstate.o: ../../lib/lua/src/lstate.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lstring.o: ../../lib/lua/src/lstring.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lstrlib.o: ../../lib/lua/src/lstrlib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ltable.o: ../../lib/lua/src/ltable.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ltablib.o: ../../lib/lua/src/ltablib.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_ltm.o: ../../lib/lua/src/ltm.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lua.o: ../../lib/lua/src/lua.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_luac.o: ../../lib/lua/src/luac.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lundump.o: ../../lib/lua/src/lundump.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lvm.o: ../../lib/lua/src/lvm.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +lua_lzio.o: ../../lib/lua/src/lzio.c + $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< + +cppunit_AdditionalMessage.o: ../../lib/cppunit/src/cppunit/AdditionalMessage.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Asserter.o: ../../lib/cppunit/src/cppunit/Asserter.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_BeOsDynamicLibraryManager.o: ../../lib/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_BriefTestProgressListener.o: ../../lib/cppunit/src/cppunit/BriefTestProgressListener.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_CompilerOutputter.o: ../../lib/cppunit/src/cppunit/CompilerOutputter.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Exception.o: ../../lib/cppunit/src/cppunit/Exception.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Message.o: ../../lib/cppunit/src/cppunit/Message.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_PlugInManager.o: ../../lib/cppunit/src/cppunit/PlugInManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_PlugInParameters.o: ../../lib/cppunit/src/cppunit/PlugInParameters.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Protector.o: ../../lib/cppunit/src/cppunit/Protector.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_ProtectorChain.o: ../../lib/cppunit/src/cppunit/ProtectorChain.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_RepeatedTest.o: ../../lib/cppunit/src/cppunit/RepeatedTest.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_ShlDynamicLibraryManager.o: ../../lib/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_SourceLine.o: ../../lib/cppunit/src/cppunit/SourceLine.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_StringTools.o: ../../lib/cppunit/src/cppunit/StringTools.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_SynchronizedObject.o: ../../lib/cppunit/src/cppunit/SynchronizedObject.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Test.o: ../../lib/cppunit/src/cppunit/Test.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestAssert.o: ../../lib/cppunit/src/cppunit/TestAssert.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestCase.o: ../../lib/cppunit/src/cppunit/TestCase.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestCaseDecorator.o: ../../lib/cppunit/src/cppunit/TestCaseDecorator.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestComposite.o: ../../lib/cppunit/src/cppunit/TestComposite.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestDecorator.o: ../../lib/cppunit/src/cppunit/TestDecorator.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestFactoryRegistry.o: ../../lib/cppunit/src/cppunit/TestFactoryRegistry.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestFailure.o: ../../lib/cppunit/src/cppunit/TestFailure.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestLeaf.o: ../../lib/cppunit/src/cppunit/TestLeaf.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestNamer.o: ../../lib/cppunit/src/cppunit/TestNamer.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestPath.o: ../../lib/cppunit/src/cppunit/TestPath.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestPlugInDefaultImpl.o: ../../lib/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestResult.o: ../../lib/cppunit/src/cppunit/TestResult.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestResultCollector.o: ../../lib/cppunit/src/cppunit/TestResultCollector.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestRunner.o: ../../lib/cppunit/src/cppunit/TestRunner.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestSetUp.o: ../../lib/cppunit/src/cppunit/TestSetUp.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestSuccessListener.o: ../../lib/cppunit/src/cppunit/TestSuccessListener.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestSuite.o: ../../lib/cppunit/src/cppunit/TestSuite.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TestSuiteBuilderContext.o: ../../lib/cppunit/src/cppunit/TestSuiteBuilderContext.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TextOutputter.o: ../../lib/cppunit/src/cppunit/TextOutputter.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TextTestProgressListener.o: ../../lib/cppunit/src/cppunit/TextTestProgressListener.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TextTestResult.o: ../../lib/cppunit/src/cppunit/TextTestResult.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TextTestRunner.o: ../../lib/cppunit/src/cppunit/TextTestRunner.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_TypeInfoHelper.o: ../../lib/cppunit/src/cppunit/TypeInfoHelper.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_UnixDynamicLibraryManager.o: ../../lib/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_Win32DynamicLibraryManager.o: ../../lib/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_XmlDocument.o: ../../lib/cppunit/src/cppunit/XmlDocument.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_XmlElement.o: ../../lib/cppunit/src/cppunit/XmlElement.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_XmlOutputter.o: ../../lib/cppunit/src/cppunit/XmlOutputter.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_XmlOutputterHook.o: ../../lib/cppunit/src/cppunit/XmlOutputterHook.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_DefaultProtector.o: ../../lib/cppunit/src/cppunit/DefaultProtector.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_DynamicLibraryManager.o: ../../lib/cppunit/src/cppunit/DynamicLibraryManager.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +cppunit_DynamicLibraryManagerException.o: ../../lib/cppunit/src/cppunit/DynamicLibraryManagerException.cpp + $(CXX) -c -o $@ $(CPPUNIT_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_aboutdialog.o: ../../src/aboutdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_accountdialog.o: ../../src/accountdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_appstartdialog.o: ../../src/appstartdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_assetdialog.o: ../../src/assetdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_assetspanel.o: ../../src/assetspanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_attachmentdialog.o: ../../src/attachmentdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_billsdepositsdialog.o: ../../src/billsdepositsdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_billsdepositspanel.o: ../../src/billsdepositspanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetentrydialog.o: ../../src/budgetentrydialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetingpanel.o: ../../src/budgetingpanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetyeardialog.o: ../../src/budgetyeardialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetyearentrydialog.o: ../../src/budgetyearentrydialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_categdialog.o: ../../src/categdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_constants.o: ../../src/constants.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_currencydialog.o: ../../src/currencydialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_dbwrapper.o: ../../src/dbwrapper.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_filtertransdialog.o: ../../src/filtertransdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_general_report_manager.o: ../../src/general_report_manager.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_images_list.o: ../../src/images_list.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_maincurrencydialog.o: ../../src/maincurrencydialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_minimal_editor.o: ../../src/minimal_editor.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmCalculator.o: ../../src/mmCalculator.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmOption.o: ../../src/mmOption.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmcheckingpanel.o: ../../src/mmcheckingpanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmex.o: ../../src/mmex.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmframe.o: ../../src/mmframe.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmhelppanel.o: ../../src/mmhelppanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmhomepagepanel.o: ../../src/mmhomepagepanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmreportspanel.o: ../../src/mmreportspanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_optionsdialog.o: ../../src/optionsdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_paths.o: ../../src/paths.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_payeedialog.o: ../../src/payeedialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_recentfiles.o: ../../src/recentfiles.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_relocatecategorydialog.o: ../../src/relocatecategorydialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_relocatepayeedialog.o: ../../src/relocatepayeedialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_splitdetailsdialog.o: ../../src/splitdetailsdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_splittransactionsdialog.o: ../../src/splittransactionsdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_stockdialog.o: ../../src/stockdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_stockspanel.o: ../../src/stockspanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_transdialog.o: ../../src/transdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_util.o: ../../src/util.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_webapp.o: ../../src/webapp.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_webserver.o: ../../src/webserver.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_wizard_newaccount.o: ../../src/wizard_newaccount.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_wizard_newdb.o: ../../src/wizard_newdb.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budget.o: ../../src/reports/budget.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetcategorysummary.o: ../../src/reports/budgetcategorysummary.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_budgetingperf.o: ../../src/reports/budgetingperf.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_cashflow.o: ../../src/reports/cashflow.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_categexp.o: ../../src/reports/categexp.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_categovertimeperf.o: ../../src/reports/categovertimeperf.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_chart.o: ../../src/reports/chart.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_html_widget_bills_and_deposits.o: ../../src/reports/html_widget_bills_and_deposits.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_html_widget_stocks.o: ../../src/reports/html_widget_stocks.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_html_widget_top_categories.o: ../../src/reports/html_widget_top_categories.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_htmlbuilder.o: ../../src/reports/htmlbuilder.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_incexpenses.o: ../../src/reports/incexpenses.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmDateRange.o: ../../src/reports/mmDateRange.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmgraphgenerator.o: ../../src/reports/mmgraphgenerator.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmgraphincexpensesmonth.o: ../../src/reports/mmgraphincexpensesmonth.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmgraphpie.o: ../../src/reports/mmgraphpie.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmgraphtopcategories.o: ../../src/reports/mmgraphtopcategories.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_payee.o: ../../src/reports/payee.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_reportbase.o: ../../src/reports/reportbase.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_transactions.o: ../../src/reports/transactions.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_platfdep.o: ../../src/win/platfdep.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_export.o: ../../src/import_export/export.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_qif_export.o: ../../src/import_export/qif_export.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_qif_import.o: ../../src/import_export/qif_import.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_qif_import_gui.o: ../../src/import_export/qif_import_gui.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_univcsvdialog.o: ../../src/import_export/univcsvdialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Account.o: ../../src/model/Model_Account.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Asset.o: ../../src/model/Model_Asset.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Attachment.o: ../../src/model/Model_Attachment.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Billsdeposits.o: ../../src/model/Model_Billsdeposits.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Budget.o: ../../src/model/Model_Budget.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Budgetsplittransaction.o: ../../src/model/Model_Budgetsplittransaction.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Budgetyear.o: ../../src/model/Model_Budgetyear.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Category.o: ../../src/model/Model_Category.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Checking.o: ../../src/model/Model_Checking.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Currency.o: ../../src/model/Model_Currency.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Infotable.o: ../../src/model/Model_Infotable.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Payee.o: ../../src/model/Model_Payee.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Report.o: ../../src/model/Model_Report.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Setting.o: ../../src/model/Model_Setting.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Splittransaction.o: ../../src/model/Model_Splittransaction.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Stock.o: ../../src/model/Model_Stock.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Subcategory.o: ../../src/model/Model_Subcategory.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_Model_Usage.o: ../../src/model/Model_Usage.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_html_template.o: ../../3rd/cgitemplate/html_template.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mongoose.o: ../../3rd/mongoose/mongoose.c + $(CC) -c -o $@ $(MMEX_TESTS_CFLAGS) $(CPPDEPS) $< + +mmex_tests_csv_parser.o: ../../3rd/csv-parser/csv_parser.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_cpu_timer.o: ../../tests/cpu_timer.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_db_init_model.o: ../../tests/db_init_model.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_framebase_tests.o: ../../tests/framebase_tests.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmex_tests.o: ../../tests/mmex_tests.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_about_dialog.o: ../../tests/test_about_dialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_assets.o: ../../tests/test_assets.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_billsdeposits.o: ../../tests/test_billsdeposits.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_callback_hooks.o: ../../tests/test_callback_hooks.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_checking.o: ../../tests/test_checking.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_currency.o: ../../tests/test_currency.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_database_initialisation.o: ../../tests/test_database_initialisation.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_date_range.o: ../../tests/test_date_range.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_filtertrans_dialog.o: ../../tests/test_filtertrans_dialog.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_relocate_category.o: ../../tests/test_relocate_category.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_relocate_payee.o: ../../tests/test_relocate_payee.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_test_stocks.o: ../../tests/test_stocks.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + +mmex_tests_mmex_tests_rc.o: ../../tests/mmex_tests.rc + windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_27_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_4) --include-dir ../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../lib/wxsqlite3/include --include-dir ../../lib/lua/src --include-dir ../../lib --include-dir ../../3rd --include-dir ../../3rd/LuaGlue/include --include-dir ../../3rd/cgitemplate --include-dir ../../3rd/csv-parser/include --include-dir ../../src --define NOPCH --include-dir ../../src --include-dir ../../lib/cppunit/include --define wxIMPLEMENT_WXWIN_MAIN= + +.PHONY: all install uninstall clean check + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d Property changes on: trunk/build/msw_tests/makefile.gcc ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/build/msw_tests/makefile.vc =================================================================== --- trunk/build/msw_tests/makefile.vc (rev 0) +++ trunk/build/msw_tests/makefile.vc 2014-05-16 15:45:03 UTC (rev 6596) @@ -0,0 +1,1105 @@ +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.9 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +COMPILER_PREFIX = vc +WXSQLITE_CFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 /W4 $(__DEBUGINFO) \ + $(____DEBUGINFO) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ + /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /DNOPCH /DSQLITE_CORE /DSQLITE_ENABLE_FTS3 \ + /DSQLITE_ENABLE_FTS3_PARENTHESIS /DSQLITE_HAS_CODEC \ + /DSQLITE_ENABLE_COLUMN_METADATA /DWXSQLITE3_HAVE_CODEC \ + /DWXSQLITE3_HAVE_METADATA /I..\..\lib\wxsqlite3\sqlite3\secure\src \ + /I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) +WXSQLITE_CXXFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 /W4 $(__DEBUGINFO) \ + $(____DEBUGINFO) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ + /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /DNOPCH /DSQLITE_CORE /DSQLITE_ENABLE_FTS3 \ + /DSQLITE_ENABLE_FTS3_PARENTHESIS /DSQLITE_HAS_CODEC \ + /DSQLITE_ENABLE_COLUMN_METADATA /DWXSQLITE3_HAVE_CODEC \ + /DWXSQLITE3_HAVE_METADATA /I..\..\lib\wxsqlite3\sqlite3\secure\src \ + /I..\..\lib\wxsqlite3\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) +WXSQLITE_OBJECTS = \ + wxsqlite_wxsqlite3.obj \ + wxsqlite_sqlite3secure.obj +LUA_CFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 /W4 $(__DEBUGINFO) $(____DEBUGINFO) \ + /Fdlua.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ + $(CPPFLAGS) $(CFLAGS) +LUA_OBJECTS = \ + lua_lapi.obj \ + lua_lauxlib.obj \ + lua_lbaselib.obj \ + lua_lbitlib.obj \ + lua_lcode.obj \ + lua_lcorolib.obj \ + lua_lctype.obj \ + lua_ldblib.obj \ + lua_ldebug.obj \ + lua_ldo.obj \ + lua_ldump.obj \ + lua_lfunc.obj \ + lua_lgc.obj \ + lua_linit.obj \ + lua_liolib.obj \ + lua_llex.obj \ + lua_lmathlib.obj \ + lua_lmem.obj \ + lua_loadlib.obj \ + lua_lobject.obj \ + lua_lopcodes.obj \ + lua_loslib.obj \ + lua_lparser.obj \ + lua_lstate.obj \ + lua_lstring.obj \ + lua_lstrlib.obj \ + lua_ltable.obj \ + lua_ltablib.obj \ + lua_ltm.obj \ + lua_lua.obj \ + lua_luac.obj \ + lua_lundump.obj \ + lua_lvm.obj \ + lua_lzio.obj +CPPUNIT_CXXFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 /W4 $(__DEBUGINFO) \ + $(____DEBUGINFO) /Fdcppunit.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ + /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES_1)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /I..\..\lib\cppunit\include /EHsc /GR $(CPPFLAGS) \ + $(CXXFLAGS) +CPPUNIT_OBJECTS = \ + cppunit_AdditionalMessage.obj \ + cppunit_Asserter.obj \ + cppunit_BeOsDynamicLibraryManager.obj \ + cppunit_BriefTestProgressListener.obj \ + cppunit_CompilerOutputter.obj \ + cppunit_Exception.obj \ + cppunit_Message.obj \ + cppunit_PlugInManager.obj \ + cppunit_PlugInParameters.obj \ + cppunit_Protector.obj \ + cppunit_ProtectorChain.obj \ + cppunit_RepeatedTest.obj \ + cppunit_ShlDynamicLibraryManager.obj \ + cppunit_SourceLine.obj \ + cppunit_StringTools.obj \ + cppunit_SynchronizedObject.obj \ + cppunit_Test.obj \ + cppunit_TestAssert.obj \ + cppunit_TestCase.obj \ + cppunit_TestCaseDecorator.obj \ + cppunit_TestComposite.obj \ + cppunit_TestDecorator.obj \ + cppunit_TestFactoryRegistry.obj \ + cppunit_TestFailure.obj \ + cppunit_TestLeaf.obj \ + cppunit_TestNamer.obj \ + cppunit_TestPath.obj \ + cppunit_TestPlugInDefaultImpl.obj \ + cppunit_TestResult.obj \ + cppunit_TestResultCollector.obj \ + cppunit_TestRunner.obj \ + cppunit_TestSetUp.obj \ + cppunit_TestSuccessListener.obj \ + cppunit_TestSuite.obj \ + cppunit_TestSuiteBuilderContext.obj \ + cppunit_TextOutputter.obj \ + cppunit_TextTestProgressListener.obj \ + cppunit_TextTestResult.obj \ + cppunit_TextTestRunner.obj \ + cppunit_TypeInfoHelper.obj \ + cppunit_UnixDynamicLibraryManager.obj \ + cppunit_Win32DynamicLibraryManager.obj \ + cppunit_XmlDocument.obj \ + cppunit_XmlElement.obj \ + cppunit_XmlOutputter.obj \ + cppunit_XmlOutputterHook.obj \ + cppunit_DefaultProtector.obj \ + cppunit_DynamicLibraryManager.obj \ + cppunit_DynamicLibraryManagerException.obj +MMEX_TESTS_CFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES_2)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /W4 $(__DEBUGINFO) $(____DEBUGINFO) /Fdmmex_tests.pdb \ + $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ + /I..\..\lib\wxsqlite3\sqlite3\secure\src /I..\..\lib\wxsqlite3\include \ + /I..\..\lib\lua\src /I..\..\lib /I..\..\3rd /I..\..\3rd\LuaGlue\include \ + /I..\..\3rd\cgitemplate /I..\..\3rd\csv-parser\include /I..\..\src /DNOPCH \ + /D_CONSOLE /I..\..\src /I..\..\lib\cppunit\include \ + /DwxIMPLEMENT_WXWIN_MAIN= $(CPPFLAGS) $(CFLAGS) +MMEX_TESTS_CXXFLAGS = /MD$(__DEBUGINFO_2) /DWIN32 $(____WX_SHARED) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES_2)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include /W4 $(__DEBUGINFO) $(____DEBUGINFO) /Fdmmex_tests.pdb \ + $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ + /I..\..\lib\wxsqlite3\sqlite3\secure\src /I..\..\lib\wxsqlite3\include \ + /I..\..\lib\lua\src /I..\..\lib /I..\..\3rd /I..\..\3rd\LuaGlue\include \ + /I..\..\3rd\cgitemplate /I..\..\3rd\csv-parser\include /I..\..\src /DNOPCH \ + /D_CONSOLE /I..\..\src /I..\..\lib\cppunit\include \ + /DwxIMPLEMENT_WXWIN_MAIN= /EHsc /GR $(__mmex_tests_CL_FLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) +MMEX_TESTS_OBJECTS = \ + mmex_tests_aboutdialog.obj \ + mmex_tests_accountdialog.obj \ + mmex_tests_appstartdialog.obj \ + mmex_tests_assetdialog.obj \ + mmex_tests_assetspanel.obj \ + mmex_tests_attachmentdialog.obj \ + mmex_tests_billsdepositsdialog.obj \ + mmex_tests_billsdepositspanel.obj \ + mmex_tests_budgetentrydialog.obj \ + mmex_tests_budgetingpanel.obj \ + mmex_tests_budgetyeardialog.obj \ + mmex_tests_budgetyearentrydialog.obj \ + mmex_tests_categdialog.obj \ + mmex_tests_constants.obj \ + mmex_tests_currencydialog.obj \ + mmex_tests_dbwrapper.obj \ + mmex_tests_filtertransdialog.obj \ + mmex_tests_general_report_manager.obj \ + mmex_tests_images_list.obj \ + mmex_tests_maincurrencydialog.obj \ + mmex_tests_minimal_editor.obj \ + mmex_tests_mmCalculator.obj \ + mmex_tests_mmOption.obj \ + mmex_tests_mmcheckingpanel.obj \ + mmex_tests_mmex.obj \ + mmex_tests_mmframe.obj \ + mmex_tests_mmhelppanel.obj \ + mmex_tests_mmhomepagepanel.obj \ + mmex_tests_mmreportspanel.obj \ + mmex_tests_optionsdialog.obj \ + mmex_tests_paths.obj \ + mmex_tests_payeedialog.obj \ + mmex_tests_recentfiles.obj \ + mmex_tests_relocatecategorydialog.obj \ + mmex_tests_relocatepayeedialog.obj \ + mmex_tests_splitdetailsdialog.obj \ + mmex_tests_splittransactionsdialog.obj \ + mmex_tests_stockdialog.obj \ + mmex_tests_stockspanel.obj \ + mmex_tests_transdialog.obj \ + mmex_tests_util.obj \ + mmex_tests_webapp.obj \ + mmex_tests_webserver.obj \ + mmex_tests_wizard_newaccount.obj \ + mmex_tests_wizard_newdb.obj \ + mmex_tests_budget.obj \ + mmex_tests_budgetcategorysummary.obj \ + mmex_tests_budgetingperf.obj \ + mmex_tests_cashflow.obj \ + mmex_tests_categexp.obj \ + mmex_tests_categovertimeperf.obj \ + mmex_tests_chart.obj \ + mmex_tests_html_widget_bills_and_deposits.obj \ + mmex_tests_html_widget_stocks.obj \ + mmex_tests_html_widget_top_categories.obj \ + mmex_tests_htmlbuilder.obj \ + mmex_tests_incexpenses.obj \ + mmex_tests_mmDateRange.obj \ + mmex_tests_mmgraphgenerator.obj \ + mmex_tests_mmgraphincexpensesmonth.obj \ + mmex_tests_mmgraphpie.obj \ + mmex_tests_mmgraphtopcategories.obj \ + mmex_tests_payee.obj \ + mmex_tests_reportbase.obj \ + mmex_tests_transactions.obj \ + mmex_tests_platfdep.obj \ + mmex_tests_export.obj \ + mmex_tests_qif_export.obj \ + mmex_tests_qif_import.obj \ + mmex_tests_qif_import_gui.obj \ + mmex_tests_univcsvdialog.obj \ + mmex_tests_Model_Account.obj \ + mmex_tests_Model_Asset.obj \ + mmex_tests_Model_Attachment.obj \ + mmex_tests_Model_Billsdeposits.obj \ + mmex_tests_Model_Budget.obj \ + mmex_tests_Model_Budgetsplittransaction.obj \ + mmex_tests_Model_Budgetyear.obj \ + mmex_tests_Model_Category.obj \ + mmex_tests_Model_Checking.obj \ + mmex_tests_Model_Currency.obj \ + mmex_tests_Model_Infotable.obj \ + mmex_tests_Model_Payee.obj \ + mmex_tests_Model_Report.obj \ + mmex_tests_Model_Setting.obj \ + mmex_tests_Model_Splittransaction.obj \ + mmex_tests_Model_Stock.obj \ + mmex_tests_Model_Subcategory.obj \ + mmex_tests_Model_Usage.obj \ + mmex_tests_html_template.obj \ + mmex_tests_mongoose.obj \ + mmex_tests_csv_parser.obj \ + mmex_tests_cpu_timer.obj \ + mmex_tests_db_init_model.obj \ + mmex_tests_framebase_tests.obj \ + mmex_tests_mmex_tests.obj \ + mmex_tests_test_about_dialog.obj \ + mmex_tests_test_assets.obj \ + mmex_tests_test_billsdeposits.obj \ + mmex_tests_test_callback_hooks.obj \ + mmex_tests_test_checking.obj \ + mmex_tests_test_currency.obj \ + mmex_tests_test_database_initialisation.obj \ + mmex_tests_test_date_range.obj \ + mmex_tests_test_filtertrans_dialog.obj \ + mmex_tests_test_relocate_category.obj \ + mmex_tests_test_relocate_payee.obj \ + mmex_tests_test_stocks.obj +MMEX_TESTS_RESOURCES = \ + mmex_tests_mmex_tests.res + +### Conditionally set variables: ### + +!if "$(WX_DEBUG)" == "1" +WX3RDPARTYLIBPOSTFIX = d +!endif +!if "$(TARGET_CPU)" == "AMD64" +WXMACHINE_FLAG = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +WXMACHINE_FLAG = /MACHINE:IA64 +!endif +!if "$(WX_SHARED)" == "0" +WXLIBPATH = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +WXLIBPATH = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES_1 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES_1 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(WX_SHARED)" == "0" +____WX_SHARED_47_p_1 = +!endif +!if "$(WX_SHARED)" == "1" +____WX_SHARED_47_p_1 = /d WXUSINGDLL +!endif +!if "$(WX_UNICODE)" == "1" +__WXUNICODE_DEFINE_p_3 = /d _UNICODE +!endif +!if "$(WX_DEBUG)" == "1" +__WXDEBUG_DEFINE_p_3 = /d __WXDEBUG__ +!endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES_2 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES_2 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES_4 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES_4 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +____mmex_tests_CPU_SUF_FILENAMES = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +____mmex_tests_CPU_SUF_FILENAMES = _ia64 +!endif +!if "$(WX_SHARED)" == "0" +____mmex_tests_LIB_SUF_FILENAMES = _lib +!endif +!if "$(WX_SHARED)" == "1" +____mmex_tests_LIB_SUF_FILENAMES = _dll +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_55 = +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_55 = /DEBUG +!endif +!if "$(WX_DEBUG)" == "0" +____DEBUGINFO_56_p_1 = +!endif +!if "$(WX_DEBUG)" == "1" +____DEBUGINFO_56_p_1 = /d _DEBUG +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_58 = /opt:ref /opt:icf +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_58 = +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_59 = +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_59 = $(__DEBUGINFO_58) +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUG_DEFINE_p_4 = /d NDEBUG +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUG_DEFINE_p_4 = /d _DEBUG +!endif +!if "$(WX_DEBUG)" == "0" +__mmex_tests_CL_FLAGS = /Zi +!endif +!if "$(WX_DEBUG)" == "0" +__mmex_tests_LINK_FLAGS = /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_QA_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_qa.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_NET_NAME_p = wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_XML_NAME_p = wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_AUI_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_aui.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_STC_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_WEBVIEW_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_webview.lib +!endif +!if "$(WX_MONOLITHIC)" == "0" +__WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib +!endif +!if "$(WX_MONOLITHIC)" == "1" +__WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX).lib +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO = +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO = /Zi +!endif +!if "$(WX_DEBUG)" == "0" +____DEBUGINFO = +!endif +!if "$(WX_DEBUG)" == "1" +____DEBUGINFO = /D_DEBUG +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_2 = d +!endif +!if "$(WX_DEBUG)" == "0" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(WX_DEBUG)" == "1" +__OPTIMIZEFLAG = /Od +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUG_DEFINE_p = /DNDEBUG +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUG_DEFINE_p = /D_DEBUG +!endif +!if "$(WX_SHARED)" == "0" +____WX_SHARED = +!endif +!if "$(WX_SHARED)" == "1" +____WX_SHARED = /DWXUSINGDLL +!endif +!if "$(WX_UNICODE)" == "1" +__WXUNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(WX_DEBUG)" == "1" +__WXDEBUG_DEFINE_p = /D__WXDEBUG__ +!endif +!if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" +WXLIBPOSTFIX = u +!endif +!if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" +WXLIBPOSTFIX = d +!endif +!if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" +WXLIBPOSTFIX = ud +!endif +!if "$(TARGET_CPU)" == "AMD64" +WXCPU = _x64 +!endif +!if "$(TARGET_CPU)" == "IA64" +WXCPU = _ia64 +!endif + + +### Targets: ### + +all: test_for_selected_wxbuild wxsqlite.lib lua.lib cppunit.lib mmex_tests.exe + +install: + +uninstall: + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + -if exist wxsqlite.lib del wxsqlite.lib + -if exist lua.lib del lua.lib + -if exist cppunit.lib del cppunit.lib + -if exist mmex_tests.exe del mmex_tests.exe + -if exist mmex_tests.ilk del mmex_tests.ilk + -if exist mmex_tests.pdb del mmex_tests.pdb + +test_for_selected_wxbuild: + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo The selected wxWidgets build is not available! + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo Please use the options prefixed with WX_ to select another wxWidgets build. + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + echo ---------------------------------------------------------------------------- + @if not exist $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX)\wx\setup.h \ + exit 1 + +wxsqlite.lib: $(WXSQLITE_OBJECTS) + if exist $@ del $@ + link /LIB /NOLOGO /OUT:$@ @<< + $(WXSQLITE_OBJECTS) +<< + +lua.lib: $(LUA_OBJECTS) + if exist $@ del $@ + link /LIB /NOLOGO /OUT:$@ @<< + $(LUA_OBJECTS) +<< + +cppunit.lib: $(CPPUNIT_OBJECTS) + if exist $@ del $@ + link /LIB /NOLOGO /OUT:$@ @<< + $(CPPUNIT_OBJECTS) +<< + +mmex_tests.exe: $(MMEX_TESTS_OBJECTS) wxsqlite.lib lua.lib cppunit.lib mmex_tests_mmex_tests.res + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_4) $(WXMACHINE_FLAG) /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) $(__DEBUGINFO_55) /pdb:"mmex_tests.pdb" $(__DEBUGINFO_59) /SAFESEH:NO $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(MMEX_TESTS_OBJECTS) $(MMEX_TESTS_RESOURCES) wxsqlite.lib lua.lib $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib cppunit.lib +<< + mt.exe -manifest ".\mmex_tests.exe.manifest" -outputresource:".\mmex_tests.exe";1 + +check: all + .\mmex_tests.exe + +wxsqlite_wxsqlite3.obj: ..\..\lib\wxsqlite3\src\wxsqlite3.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXSQLITE_CXXFLAGS) ..\..\lib\wxsqlite3\src\wxsqlite3.cpp + +wxsqlite_sqlite3secure.obj: ..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c + $(CC) /c /nologo /TC /Fo$@ $(WXSQLITE_CFLAGS) ..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c + +lua_lapi.obj: ..\..\lib\lua\src\lapi.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lapi.c + +lua_lauxlib.obj: ..\..\lib\lua\src\lauxlib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lauxlib.c + +lua_lbaselib.obj: ..\..\lib\lua\src\lbaselib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lbaselib.c + +lua_lbitlib.obj: ..\..\lib\lua\src\lbitlib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lbitlib.c + +lua_lcode.obj: ..\..\lib\lua\src\lcode.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lcode.c + +lua_lcorolib.obj: ..\..\lib\lua\src\lcorolib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lcorolib.c + +lua_lctype.obj: ..\..\lib\lua\src\lctype.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lctype.c + +lua_ldblib.obj: ..\..\lib\lua\src\ldblib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\ldblib.c + +lua_ldebug.obj: ..\..\lib\lua\src\ldebug.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\ldebug.c + +lua_ldo.obj: ..\..\lib\lua\src\ldo.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\ldo.c + +lua_ldump.obj: ..\..\lib\lua\src\ldump.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\ldump.c + +lua_lfunc.obj: ..\..\lib\lua\src\lfunc.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lfunc.c + +lua_lgc.obj: ..\..\lib\lua\src\lgc.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\lgc.c + +lua_linit.obj: ..\..\lib\lua\src\linit.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\linit.c + +lua_liolib.obj: ..\..\lib\lua\src\liolib.c + $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\lib\lua\src\l... [truncated message content] |
From: <gua...@us...> - 2014-05-16 15:03:59
|
Revision: 6595 http://sourceforge.net/p/moneymanagerex/code/6595 Author: guanlisheng Date: 2014-05-16 15:03:55 +0000 (Fri, 16 May 2014) Log Message: ----------- speedup Modified Paths: -------------- trunk/src/model/Model_Infotable.cpp trunk/src/model/Model_Setting.cpp Modified: trunk/src/model/Model_Infotable.cpp =================================================================== --- trunk/src/model/Model_Infotable.cpp 2014-05-16 11:38:00 UTC (rev 6594) +++ trunk/src/model/Model_Infotable.cpp 2014-05-16 15:03:55 UTC (rev 6595) @@ -109,8 +109,16 @@ wxString Model_Infotable::GetStringInfo(const wxString& key, const wxString& default_value) { - Data_Set items = this->find(INFONAME(key)); - if (!items.empty()) return items[0].INFOVALUE; + Data* info = this->get_one(INFONAME(key)); + if (!info) // not cached + { + Data_Set items = this->find(INFONAME(key)); + if (!items.empty()) return items[0].INFOVALUE; + } + else + { + return info->INFOVALUE; + } return default_value; } Modified: trunk/src/model/Model_Setting.cpp =================================================================== --- trunk/src/model/Model_Setting.cpp 2014-05-16 11:38:00 UTC (rev 6594) +++ trunk/src/model/Model_Setting.cpp 2014-05-16 15:03:55 UTC (rev 6595) @@ -130,8 +130,16 @@ wxString Model_Setting::GetStringSetting(const wxString& key, const wxString& default_value) { - Data_Set items = this->find(SETTINGNAME(key)); - if (!items.empty()) return items[0].SETTINGVALUE; + Data* setting = this->get_one(SETTINGNAME(key)); + if (!setting) // not cached + { + Data_Set items = this->find(SETTINGNAME(key)); + if (!items.empty()) return items[0].SETTINGVALUE; + } + else + { + return setting->SETTINGVALUE; + } return default_value; } This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-16 11:38:04
|
Revision: 6594 http://sourceforge.net/p/moneymanagerex/code/6594 Author: stef145g Date: 2014-05-16 11:38:00 +0000 (Fri, 16 May 2014) Log Message: ----------- clean-up Modified Paths: -------------- trunk/build/bakefiles/Bakefiles.bkgen trunk/build/bakefiles/common.bkl trunk/build/bakefiles/mmex.bkl trunk/build/bakefiles/mmex_tests.bkl Modified: trunk/build/bakefiles/Bakefiles.bkgen =================================================================== --- trunk/build/bakefiles/Bakefiles.bkgen 2014-05-16 03:37:59 UTC (rev 6593) +++ trunk/build/bakefiles/Bakefiles.bkgen 2014-05-16 11:38:00 UTC (rev 6594) @@ -7,7 +7,6 @@ <bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen"> - <!-- All .bkl files in mmex tree --> <input> @@ -16,7 +15,6 @@ ../../po/*.bkl ../../setup/win/*.bkl </input> - <!-- Output formats to generate for all .bkl --> @@ -24,35 +22,36 @@ autoconf,mingw,msvc </add-formats> - <!-- Add these formats for given .bkl --> <add-formats files="../../po/*.bkl,../../setup/win/*.bkl"> gnu </add-formats> + <add-formats files="mmex.bkl,mmex_tests.bkl"> msvs2008prj </add-formats> - <!-- Do not generate these formats for given .bkl --> <del-formats files="../../po/*.bkl,../../setup/win/*.bkl"> msvs2008prj </del-formats> - <!-- Directories where the files go --> <add-flags files="mmex.bkl" formats="autoconf"> -o../../Makefile.in </add-flags> + <add-flags files="mmex.bkl" formats="mingw"> -o../msw/makefile.gcc </add-flags> + <add-flags files="mmex.bkl" formats="msvc"> -o../msw/makefile.vc </add-flags> + <add-flags files="mmex.bkl" formats="msvs2008prj"> -o../msw/mmex.sln -DMSVS_PLATFORMS=win32,win64 @@ -61,18 +60,20 @@ <add-flags files="mmex_tests.bkl" formats="autoconf"> -o../../tests/Makefile.in </add-flags> + <add-flags files="mmex_tests.bkl" formats="mingw"> -o../msw/tests/makefile.gcc </add-flags> + <add-flags files="mmex_tests.bkl" formats="msvc"> -o../msw/tests/makefile.vc </add-flags> + <add-flags files="mmex_tests.bkl" formats="msvs2008prj"> -o../msw/tests/mmex_tests.sln -DMSVS_PLATFORMS=win32,win64 </add-flags> - <!-- Format specific settings --> <add-flags formats="autoconf"> @@ -83,12 +84,12 @@ -DFORMAT_HAS_MAKE_INSTALL=1 </add-flags> - <!-- Makefile specific settings --> <add-flags files="mmex.bkl" formats="mingw"> -DOPTIONS_FILE=config.gcc </add-flags> + <add-flags files="mmex_tests.bkl" formats="mingw"> -DOPTIONS_FILE=../config.gcc -DWRITE_OPTIONS_FILE=0 </add-flags> @@ -96,6 +97,7 @@ <add-flags files="mmex.bkl" formats="msvc"> -DOPTIONS_FILE=config.vc </add-flags> + <add-flags files="mmex_tests.bkl" formats="msvc"> -DOPTIONS_FILE=../config.vc -DWRITE_OPTIONS_FILE=0 </add-flags> Modified: trunk/build/bakefiles/common.bkl =================================================================== --- trunk/build/bakefiles/common.bkl 2014-05-16 03:37:59 UTC (rev 6593) +++ trunk/build/bakefiles/common.bkl 2014-05-16 11:38:00 UTC (rev 6594) @@ -12,7 +12,6 @@ <!-- check version of Bakefile --> <requires version="0.2.9"/> - <!-- define some var's for projects before calling presets --> <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2008prj']"> <set var="WX_SHARED">0</set> @@ -23,13 +22,11 @@ <include file="presets/wx.bkl"/> <include file="config.bkl"/> - <set var="CAN_CONFIG"> <!-- condition must be the same as for <include file="wx_win32.bkl"> in presets\wx\wx.bkl --> <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">1</if> </set> - <if cond="CAN_CONFIG=='1'"> <!-- redefine defaults --> @@ -92,22 +89,21 @@ <if cond="WX_DEBUG=='0'">speed</if> </set> - <set var="SHAREDBUILDPOSTFIX"> + <set var="SHAREDBUILDPOSTFIX"> <if cond="WX_SHARED=='0'">static</if> <if cond="WX_SHARED=='1'">shared</if> - </set> + </set> - <set var="UNICODEBUILDPOSTFIX"> + <set var="UNICODEBUILDPOSTFIX"> <if cond="WX_UNICODE=='1'">u</if> - </set> + </set> - <set var="DEBUGBUILDPOSTFIX"> - <if cond="WX_DEBUG=='1'">d</if> - </set> + <set var="DEBUGBUILDPOSTFIX"> + <if cond="WX_DEBUG=='1'">d</if> + </set> </if> - <!-- generic compiler's flags --> <template id="compiler_common"> @@ -125,17 +121,15 @@ </if> <if cond="FORMAT in ['msvc', 'msvs2005prj','msvs2008prj']"> - <cppflags>/D_CRT_SECURE_NO_WARNINGS</cppflags> - <ldflags>/SAFESEH:NO</ldflags> + <cppflags>/D_CRT_SECURE_NO_WARNINGS</cppflags> + <ldflags>/SAFESEH:NO</ldflags> </if> </template> - <include file="wxsqlite.bkl"/> <include file="lua.bkl"/> - <!-- Prepend valid lib-path if TARGET_CPU option set. Template "wx" sets lib-path to x86 libs (lib\vc_lib) even if x64 libs exists (lib\vc_amd64_lib). We should insert valid lib-path prior wrong one. @@ -217,12 +211,14 @@ <!-- /opt:ref option suppressed by using /debug linker option by default but should be always enabled for release builds --> - <set var="LINK_FLAGS"><if cond="WX_DEBUG=='0'">/DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF</if></set> + <set var="LINK_FLAGS"> + <if cond="WX_DEBUG=='0'">/DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF</if> + </set> + <ldflags>$(LINK_FLAGS)</ldflags> </if> - <!-- Embed a manifest inside executable for VC++. By default, Visual Studio tries to embed the manifest when it builds a project from source files. However if an application is built by using nmake, some changes to the existing makefile are necessary. @@ -236,13 +232,12 @@ <set var="TARGET_PATH">$(BUILDDIR + DIRSEP + id + EXEEXT)</set> - <postlink-command> - mt.exe -manifest "$(TARGET_PATH).manifest" -outputresource:"$(TARGET_PATH)";1 + <postlink-command> + mt.exe -manifest "$(TARGET_PATH).manifest" -outputresource:"$(TARGET_PATH)";1 </postlink-command> - </if> + </if> - <!-- wxWidgets libs, "base" must be last --> <wx-lib>core</wx-lib> @@ -258,5 +253,4 @@ </template> - </makefile> Modified: trunk/build/bakefiles/mmex.bkl =================================================================== --- trunk/build/bakefiles/mmex.bkl 2014-05-16 03:37:59 UTC (rev 6593) +++ trunk/build/bakefiles/mmex.bkl 2014-05-16 11:38:00 UTC (rev 6594) @@ -4,30 +4,29 @@ MMEX build scripts. Copyright (C) 2009, 2010 VaDiM. - MoneyManagerEx application. + MoneyManagerEx Application. --> <makefile> <!-- Default root of sources is dir where output script will be created. - autoconf generates Makefile in trunk/mmex but others in trunk/mmex/build/msw. + autoconf generates Makefile in /trunk but others in /trunk/build/msw. --> <if cond="FORMAT!='autoconf'"> - <set-srcdir>../..</set-srcdir> + <set-srcdir>../..</set-srcdir> </if> - <include file="common.bkl"/> + <!-- MoneyManagerEx Application --> - <!-- MoneyManagerEx application --> - <exe id="mmex" template="mmex_common"> <if cond="FORMAT in ['msvc', 'msvs2005prj','msvs2008prj']"> <ldflags>/SUBSYSTEM:WINDOWS,5.1</ldflags> </if> + <app-type>gui</app-type> <win32-res>resources/mmex.rc</win32-res> @@ -36,7 +35,6 @@ </exe> - <!-- "make install" targets for all formats except VC++ IDE. Windows command "copy" can't copy multiple files. "make ininstall" doesn't work on Windows due to wrong generation of command "-del". @@ -251,7 +249,6 @@ <if cond="1">$(CPU_ARCH)</if> </set> - <!-- Select VC++ runtime libraries to embed into setup. We deploying Visual C++ library DLLs as private side-by-side assemblies. @@ -301,7 +298,6 @@ </subproject> - <!-- unit tests target (not dependency of 'all'): --> <subproject id="test"> @@ -320,5 +316,4 @@ <command>rm tmp.dmg</command> </action> - </makefile> Modified: trunk/build/bakefiles/mmex_tests.bkl =================================================================== --- trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 03:37:59 UTC (rev 6593) +++ trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 11:38:00 UTC (rev 6594) @@ -4,7 +4,7 @@ MMEX build scripts. Copyright (C) 2009 VaDiM. - MMEX Unit Tests application. + MMEX Tests Application. --> <makefile> @@ -51,8 +51,7 @@ </exe> - - <!-- + <!-- make check All formats expect MS VisualStudio projects. --> @@ -60,7 +59,7 @@ <action id="check" cond="not FORMAT.endswith('prj')"> <depends>all</depends> - <is-phony>on</is-phony> + <is-phony>on</is-phony> <!-- "&&" is "&&" in XML --> @@ -88,4 +87,5 @@ </command> </action> + </makefile> This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-16 03:38:03
|
Revision: 6593 http://sourceforge.net/p/moneymanagerex/code/6593 Author: guanlisheng Date: 2014-05-16 03:37:59 +0000 (Fri, 16 May 2014) Log Message: ----------- make tests work on mac Modified Paths: -------------- trunk/tests/defined_test_selection.h Modified: trunk/tests/defined_test_selection.h =================================================================== --- trunk/tests/defined_test_selection.h 2014-05-16 03:32:24 UTC (rev 6592) +++ trunk/tests/defined_test_selection.h 2014-05-16 03:37:59 UTC (rev 6593) @@ -8,7 +8,7 @@ Purpose: To enable or disable tests from a single location. Action: Comment out any unwanted test. ******************************************************************************/ - +#pragma once #define MMEX_TESTS_ABOUT_DIALOG #define MMEX_TESTS_ASSETS #define MMEX_TESTS_BILLS_DEPOSITS This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-16 03:32:29
|
Revision: 6592 http://sourceforge.net/p/moneymanagerex/code/6592 Author: guanlisheng Date: 2014-05-16 03:32:24 +0000 (Fri, 16 May 2014) Log Message: ----------- make tests work on mac Modified Paths: -------------- trunk/build/bakefiles/mmex_tests.bkl trunk/build/msw/tests/makefile.gcc trunk/build/msw/tests/makefile.vc trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj trunk/src/budgetingpanel.cpp trunk/src/budgetingpanel.h trunk/src/mmcheckingpanel.cpp trunk/src/mmcheckingpanel.h trunk/src/mmex.cpp trunk/src/mmframe.cpp trunk/src/mmframe.h trunk/src/mmhelppanel.cpp trunk/src/mmhelppanel.h trunk/src/mmhomepagepanel.cpp trunk/src/mmhomepagepanel.h trunk/src/mmreportspanel.cpp trunk/src/mmreportspanel.h trunk/src/optionsdialog.cpp trunk/src/optionsdialog.h trunk/src/reports/budget.cpp trunk/src/reports/budgetcategorysummary.cpp trunk/src/reports/budgetingperf.cpp trunk/src/reports/cashflow.cpp trunk/src/util.cpp trunk/src/util.h trunk/tests/Makefile.in trunk/tests/cpu_timer.cpp trunk/tests/cpu_timer.h trunk/tests/test_checking.cpp Modified: trunk/build/bakefiles/mmex_tests.bkl =================================================================== --- trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/build/bakefiles/mmex_tests.bkl 2014-05-16 03:32:24 UTC (rev 6592) @@ -38,6 +38,7 @@ <!-- IMPLEMENT_APP(mmGUIApp) in mmex.cpp defines main() on Unixes, see wx\app.h. But mmex_tests.cpp also defines main(). --> + <define>wxIMPLEMENT_WXWIN_MAIN=</define> <!-- relative to trunk/mmex --> Modified: trunk/build/msw/tests/makefile.gcc =================================================================== --- trunk/build/msw/tests/makefile.gcc 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/build/msw/tests/makefile.gcc 2014-05-16 03:32:24 UTC (rev 6592) @@ -207,7 +207,7 @@ $(CC) -c -o $@ $(WXSQLITE_CFLAGS) $(CPPDEPS) $< mmex_tests_mmex_tests_rc.o: ../../tests/mmex_tests.rc - windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_27_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_4) --include-dir ../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../lib/wxsqlite3/include --include-dir ../../lib/lua/src --include-dir ../../lib --include-dir ../../3rd --include-dir ../../3rd/LuaGlue/include --include-dir ../../3rd/cgitemplate --include-dir ../../3rd/csv-parser/include --include-dir ../../src --define NOPCH --include-dir ../../src --include-dir ../../lib/cppunit/include + windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_27_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_4) --include-dir ../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../lib/wxsqlite3/include --include-dir ../../lib/lua/src --include-dir ../../lib --include-dir ../../3rd --include-dir ../../3rd/LuaGlue/include --include-dir ../../3rd/cgitemplate --include-dir ../../3rd/csv-parser/include --include-dir ../../src --define NOPCH --include-dir ../../src --include-dir ../../lib/cppunit/include --define wxIMPLEMENT_WXWIN_MAIN= .PHONY: all install uninstall clean check Modified: trunk/build/msw/tests/makefile.vc =================================================================== --- trunk/build/msw/tests/makefile.vc 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/build/msw/tests/makefile.vc 2014-05-16 03:32:24 UTC (rev 6592) @@ -288,5 +288,5 @@ $(CC) /c /nologo /TC /Fo$@ $(WXSQLITE_CFLAGS) ..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c mmex_tests_mmex_tests.res: ..\..\tests\mmex_tests.rc - rc /fo$@ /d WIN32 $(____WX_SHARED_47_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES_3)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____DEBUGINFO_56_p_1) $(__DEBUG_DEFINE_p_4) /i ..\..\lib\wxsqlite3\sqlite3\secure\src /i ..\..\lib\wxsqlite3\include /i ..\..\lib\lua\src /i ..\..\lib /i ..\..\3rd /i ..\..\3rd\LuaGlue\include /i ..\..\3rd\cgitemplate /i ..\..\3rd\csv-parser\include /i ..\..\src /d NOPCH /d _CONSOLE /i ..\..\src /i ..\..\lib\cppunit\include ..\..\tests\mmex_tests.rc + rc /fo$@ /d WIN32 $(____WX_SHARED_47_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES_3)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____DEBUGINFO_56_p_1) $(__DEBUG_DEFINE_p_4) /i ..\..\lib\wxsqlite3\sqlite3\secure\src /i ..\..\lib\wxsqlite3\include /i ..\..\lib\lua\src /i ..\..\lib /i ..\..\3rd /i ..\..\3rd\LuaGlue\include /i ..\..\3rd\cgitemplate /i ..\..\3rd\csv-parser\include /i ..\..\src /d NOPCH /d _CONSOLE /i ..\..\src /i ..\..\lib\cppunit\include /d wxIMPLEMENT_WXWIN_MAIN= ..\..\tests\mmex_tests.rc Modified: trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj =================================================================== --- trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj 2014-05-16 03:32:24 UTC (rev 6592) @@ -47,7 +47,7 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> <Tool @@ -55,7 +55,7 @@ AdditionalOptions="/MP /D_CRT_SECURE_NO_WARNINGS /Zi" Optimization="2" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" - PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -70,7 +70,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> @@ -137,7 +137,7 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> <Tool @@ -145,7 +145,7 @@ AdditionalOptions="/MP /D_CRT_SECURE_NO_WARNINGS" Optimization="0" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" - PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -162,7 +162,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> @@ -230,7 +230,7 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> <Tool @@ -238,7 +238,7 @@ AdditionalOptions="/MP /D_CRT_SECURE_NO_WARNINGS /Zi" Optimization="2" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" - PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" ExceptionHandling="1" RuntimeLibrary="2" RuntimeTypeInfo="true" @@ -253,7 +253,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="_UNICODE;__WXMSW__;NDEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswu;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> @@ -320,7 +320,7 @@ /> <Tool Name="VCMIDLTool" - PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> <Tool @@ -328,7 +328,7 @@ AdditionalOptions="/MP /D_CRT_SECURE_NO_WARNINGS" Optimization="0" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" - PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="WIN32;_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" ExceptionHandling="1" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -345,7 +345,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE" + PreprocessorDefinitions="_UNICODE;__WXDEBUG__;__WXMSW__;_DEBUG;_DEBUG;NOPCH;_CONSOLE;wxIMPLEMENT_WXWIN_MAIN=" Culture="1033" AdditionalIncludeDirectories="$(WXWIN)\lib\vc_x64_lib\mswud;$(WXWIN)\include;..\..\lib\wxsqlite3\sqlite3\secure\src;..\..\lib\wxsqlite3\include;..\..\lib\lua\src;..\..\lib;..\..\3rd;..\..\3rd\LuaGlue\include;..\..\3rd\cgitemplate;..\..\3rd\csv-parser\include;..\..\src;..\..\src;..\..\lib\cppunit\include" /> Modified: trunk/src/budgetingpanel.cpp =================================================================== --- trunk/src/budgetingpanel.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/budgetingpanel.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -68,12 +68,13 @@ END_EVENT_TABLE() /*******************************************************/ mmBudgetingPanel::mmBudgetingPanel(int budgetYearID, - wxWindow *parent, wxWindowID winid, + wxWindow *parent, mmGUIFrame* frame, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style,const wxString& name) : m_imageList() , listCtrlBudget_() , budgetYearID_(budgetYearID) +, m_frame(frame) { Create(parent, winid, pos, size, style, name); } @@ -101,7 +102,7 @@ mmBudgetingPanel::~mmBudgetingPanel() { if (m_imageList) delete m_imageList; - wxGetApp().m_frame->SetBudgetingPageInactive(); + m_frame->SetBudgetingPageInactive(); } void mmBudgetingPanel::save_column_width(int width) @@ -168,7 +169,7 @@ wxString yearStr = Model_Budgetyear::instance().Get(budgetYearID_); if ((yearStr.length() < 5)) { - if (wxGetApp().m_frame->budgetFinancialYears()) + if (mmIniOptions::instance().budgetFinancialYears_) { long year; yearStr.ToLong(&year); @@ -344,7 +345,7 @@ mmReportBudget budgetDetails; bool evaluateTransfer = false; - if (wxGetApp().m_frame->budgetTransferTotal()) + if (mmIniOptions::instance().budgetIncludeTransfers_) { evaluateTransfer = true; } @@ -443,7 +444,7 @@ budgetTotals_[category.CATEGID].first = catTotalsEstimated; budgetTotals_[category.CATEGID].second = catTotalsActual; - if (wxGetApp().m_frame->budgetSetupWithSummary() && DisplayEntryAllowed(-1, category.CATEGID)) + if (mmIniOptions::instance().budgetSetupWithoutSummaries_ && DisplayEntryAllowed(-1, category.CATEGID)) { std::pair <int, int> category_pair; category_pair.first = -1; Modified: trunk/src/budgetingpanel.h =================================================================== --- trunk/src/budgetingpanel.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/budgetingpanel.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -26,6 +26,7 @@ class wxListCtrl; class wxListEvent; class mmBudgetingPanel; +class mmGUIFrame; /* Custom ListCtrl class that implements virtual LC style */ class budgetingListCtrl : public mmListCtrl @@ -62,7 +63,7 @@ DECLARE_EVENT_TABLE() public: - mmBudgetingPanel( int budgetYearID, wxWindow *parent, + mmBudgetingPanel( int budgetYearID, wxWindow *parent, mmGUIFrame *frame, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -98,6 +99,7 @@ wxString BuildPage() const { return listCtrlBudget_->BuildPage(GetPanelTitle()); } private: + mmGUIFrame* m_frame; std::vector<std::pair<int, int> > budget_; std::map<int, std::pair<double, double> > budgetTotals_; std::map<int, std::map<int, Model_Budget::PERIOD_ENUM> > budgetPeriod_; Modified: trunk/src/mmcheckingpanel.cpp =================================================================== --- trunk/src/mmcheckingpanel.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmcheckingpanel.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -107,14 +107,17 @@ //---------------------------------------------------------------------------- mmCheckingPanel::mmCheckingPanel( - int accountID, - wxWindow *parent) + int accountID + , wxWindow *parent + , mmGUIFrame *frame + ) : filteredBalance_(0.0) , m_listCtrlAccount() , m_AccountID(accountID) , m_account(Model_Account::instance().get(accountID)) , m_currency(Model_Account::currency(m_account)) , transFilterDlg_(0) + , m_frame(frame) { m_basecurrecyID = Model_Infotable::instance().GetBaseCurrencyId(); long style = wxTAB_TRAVERSAL | wxNO_BORDER; @@ -130,12 +133,7 @@ { if (transFilterDlg_) delete transFilterDlg_; - /* Please do not remove: - The #ifndef _CONSOLE has been added for mmex_tests. - _CONSOLE is not defined in main application.*/ - #ifndef _CONSOLE - wxGetApp().m_frame->SetCheckingAccountPageInactive(); - #endif + m_frame->SetCheckingAccountPageInactive(); } bool mmCheckingPanel::Create( Modified: trunk/src/mmcheckingpanel.h =================================================================== --- trunk/src/mmcheckingpanel.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmcheckingpanel.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -30,6 +30,7 @@ //---------------------------------------------------------------------------- class mmCheckingPanel; class mmFilterTransactionsDialog; +class mmGUIFrame; //---------------------------------------------------------------------------- class TransactionListCtrl : public mmListCtrl @@ -203,7 +204,8 @@ mmCheckingPanel( int accountID, - wxWindow *parent + wxWindow *parent, + mmGUIFrame *frame ); ~mmCheckingPanel(); @@ -334,6 +336,8 @@ private: static void mmPlayTransactionSound(); +private: + mmGUIFrame *m_frame; }; //---------------------------------------------------------------------------- #endif // MM_EX_CHECKINGPANEL_H_ Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmex.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -141,7 +141,7 @@ Model_Usage::instance(app->m_setting_db); /* Force setting MMEX language parameter if it has not been set. */ - mmSelectLanguage(0, !Model_Setting::instance().ContainsSetting(LANGUAGE_PARAMETER)); + mmSelectLanguage(app, 0, !Model_Setting::instance().ContainsSetting(LANGUAGE_PARAMETER)); /* Load Colors from Database */ mmLoadColorsFromDatabase(); @@ -166,7 +166,7 @@ if (valx >= sys_screen_x ) valx = sys_screen_x - valw; if (valy >= sys_screen_y ) valy = sys_screen_y - valh; - app->m_frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh)); + app->m_frame = new mmGUIFrame(app, mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh)); Mongoose_Service::instance().open(); Modified: trunk/src/mmframe.cpp =================================================================== --- trunk/src/mmframe.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmframe.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -218,10 +218,11 @@ END_EVENT_TABLE() //---------------------------------------------------------------------------- -mmGUIFrame::mmGUIFrame(const wxString& title +mmGUIFrame::mmGUIFrame(mmGUIApp* app, const wxString& title , const wxPoint& pos , const wxSize& size) : wxFrame(0, -1, title, pos, size) +, m_app(app) , m_commit_callback_hook(0) , m_update_callback_hook(0) , gotoAccountID_(-1) @@ -250,7 +251,7 @@ // decide if we need to show app start dialog bool from_scratch = false; - wxFileName dbpath = wxGetApp().m_optParam; + wxFileName dbpath = m_app->m_optParam; if (!dbpath.IsOk()) { from_scratch = Model_Setting::instance().GetBoolSetting("SHOWBEGINAPP", true); @@ -392,9 +393,9 @@ // process all events waiting in the event queue if any. void mmGUIFrame::processPendingEvents() { - while (wxGetApp().Pending()) + while (m_app->Pending()) { - wxGetApp().Dispatch(); + m_app->Dispatch(); } } @@ -1774,7 +1775,7 @@ wxSizer *sizer = cleanupHomePanel(); budgetingPage_ = new mmBudgetingPanel(budgetYearID, - homePanel_, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + homePanel_, this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); panelCurrent_ = budgetingPage_; activeBudgetingPage_ = true; @@ -1793,7 +1794,7 @@ if (!activeHomePage_) { wxSizer *sizer = cleanupHomePanel(); panelCurrent_ = new mmHomePagePanel( - homePanel_, + homePanel_, this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, @@ -1816,7 +1817,7 @@ wxSizer *sizer = cleanupHomePanel(); rs->RefreshData(); - panelCurrent_ = new mmReportsPanel(rs, cleanup, homePanel_, wxID_STATIC, + panelCurrent_ = new mmReportsPanel(rs, cleanup, homePanel_, this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTAB_TRAVERSAL); sizer->Add(panelCurrent_, 1, wxGROW | wxALL, 1); @@ -1830,7 +1831,7 @@ { wxSizer *sizer = cleanupHomePanel(); - panelCurrent_ = new mmHelpPanel(homePanel_, wxID_STATIC + panelCurrent_ = new mmHelpPanel(homePanel_, this, wxID_STATIC , wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTAB_TRAVERSAL); sizer->Add(panelCurrent_, 1, wxGROW | wxALL, 1); @@ -2724,7 +2725,7 @@ { if (!m_db.get()) return; - mmOptionsDialog systemOptions(this); + mmOptionsDialog systemOptions(this, this->m_app); if (systemOptions.ShowModal() == wxID_OK) { //set the View Menu Option items the same as the options saved. @@ -2992,7 +2993,7 @@ wxSizer *sizer = cleanupHomePanel(); checkingAccountPage_ = new mmCheckingPanel( - accountID, homePanel_); + accountID, homePanel_, this); panelCurrent_ = checkingAccountPage_; activeCheckingAccountPage_ = true; Modified: trunk/src/mmframe.h =================================================================== --- trunk/src/mmframe.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmframe.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -56,14 +56,17 @@ class CommitCallbackHook; class UpdateCallbackHook; class ModelBase; +class mmGUIApp; //---------------------------------------------------------------------------- class mmGUIFrame : public wxFrame { public: - mmGUIFrame(const wxString& title, const wxPoint& pos, const wxSize& size); + mmGUIFrame(mmGUIApp* m_app, const wxString& title, const wxPoint& pos, const wxSize& size); ~mmGUIFrame(); - +public: + mmGUIApp *m_app; +public: void setGotoAccountID(int account_id, long transID = -1); void setHomePageActive(bool active = true); bool expandedBankAccounts() @@ -83,22 +86,6 @@ return (mmOptions::instance().financialYearStartDayString_ != "1" || mmOptions::instance().financialYearStartMonthString_ != "1"); } - bool budgetFinancialYears() - { - return menuBar_->IsChecked(MENU_VIEW_BUDGET_FINANCIAL_YEARS); - } - bool budgetSetupWithSummary() - { - return !menuBar_->IsChecked(MENU_VIEW_BUDGET_SETUP_SUMMARY); - } - bool budgetCategoryTotal() - { - return menuBar_->IsChecked(MENU_VIEW_BUDGET_CATEGORY_SUMMARY); - } - bool budgetTransferTotal() - { - return menuBar_->IsChecked(MENU_VIEW_BUDGET_TRANSFER_TOTAL); - } /// return the index (mmex::EDocFile) to return the correct file. int getHelpFileIndex() const { Modified: trunk/src/mmhelppanel.cpp =================================================================== --- trunk/src/mmhelppanel.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmhelppanel.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -28,8 +28,9 @@ EVT_BUTTON(wxID_FORWARD, mmHelpPanel::OnHelpPageForward) END_EVENT_TABLE() -mmHelpPanel::mmHelpPanel(wxWindow *parent, wxWindowID winid +mmHelpPanel::mmHelpPanel(wxWindow *parent, mmGUIFrame* frame, wxWindowID winid , const wxPoint& pos, const wxSize& size, long style, const wxString& name) + : m_frame(frame) { Create(parent, winid, pos, size, style, name); } @@ -85,7 +86,7 @@ Default help files will be used when the language help file are not found. **************************************************************************/ - int helpFileIndex = wxGetApp().m_frame->getHelpFileIndex(); + int helpFileIndex = m_frame->getHelpFileIndex(); wxFileName helpIndexFile(mmex::getPathDoc((mmex::EDocFile)helpFileIndex)); if (mmOptions::instance().language_ != "english") helpIndexFile.AppendDir(mmOptions::instance().language_); Modified: trunk/src/mmhelppanel.h =================================================================== --- trunk/src/mmhelppanel.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmhelppanel.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -23,13 +23,14 @@ #include "mmpanelbase.h" class wxWebView; +class mmGUIFrame; class mmHelpPanel : public mmPanelBase { DECLARE_EVENT_TABLE() public: - mmHelpPanel(wxWindow *parent, + mmHelpPanel(wxWindow *parent, mmGUIFrame* frame, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -39,6 +40,8 @@ wxString BuildPage() const { return ""; } void PrintPage(); +public: + mmGUIFrame *m_frame; private: wxWebView* browser_; Modified: trunk/src/mmhomepagepanel.cpp =================================================================== --- trunk/src/mmhomepagepanel.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmhomepagepanel.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -51,7 +51,7 @@ virtual wxFSFile* GetFile(const wxString &uri) { - mmGUIFrame* frame = wxGetApp().m_frame; + mmGUIFrame* frame = m_reportPanel->m_frame; wxString sData; if (uri.StartsWith("assets:", &sData)) { @@ -99,26 +99,26 @@ BEGIN_EVENT_TABLE(mmHomePagePanel, wxPanel) END_EVENT_TABLE() -mmHomePagePanel::mmHomePagePanel(wxWindow *parent +mmHomePagePanel::mmHomePagePanel(wxWindow *parent, mmGUIFrame *frame , wxWindowID winid , const wxPoint& pos , const wxSize& size , long style , const wxString& name) - : frame_(wxGetApp().m_frame) + : m_frame(frame) , countFollowUp_(0) , date_range_(0) , browser_(0) { Create(parent, winid, pos, size, style, name); - frame_->setHomePageActive(false); - frame_->menuPrintingEnable(true); + m_frame->setHomePageActive(false); + m_frame->menuPrintingEnable(true); } mmHomePagePanel::~mmHomePagePanel() { - frame_->setHomePageActive(false); - frame_->menuPrintingEnable(false); + m_frame->setHomePageActive(false); + m_frame->menuPrintingEnable(false); if (date_range_) delete date_range_; } @@ -204,7 +204,7 @@ //Stocks wxString stocks = ""; htmlWidgetStocks stocks_widget; - stocks_widget.enable_detailes(frame_->expandedStockAccounts()); + stocks_widget.enable_detailes(m_frame->expandedStockAccounts()); if (!Model_Stock::instance().all().empty()) { stocks = stocks_widget.getHTMLText(); @@ -325,15 +325,15 @@ tReconciled += reconciledBal * currency_rate; // Display the individual account links if we want to display them - if (((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts()) - || (!frame_->expandedBankAccounts() && !frame_->expandedTermAccounts())) + if (((type_is_bank) ? m_frame->expandedBankAccounts() : m_frame->expandedTermAccounts()) + || (!m_frame->expandedBankAccounts() && !m_frame->expandedTermAccounts())) { // show the actual amount in that account if (((vAccts_ == "Open" && Model_Account::status(account) == Model_Account::OPEN) || (vAccts_ == "Favorites" && Model_Account::FAVORITEACCT(account)) || (vAccts_ == VIEW_ACCOUNTS_ALL_STR)) - && ((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts())) + && ((type_is_bank) ? m_frame->expandedBankAccounts() : m_frame->expandedTermAccounts())) { body += "<tr>"; body += wxString::Format("<td><a href=\"acct:%i\">%s</a></td>", account.ACCOUNTID, account.ACCOUNTNAME); @@ -359,15 +359,15 @@ std::map<int, std::pair<double, double> > incomeExpensesStats; getExpensesIncomeStats(incomeExpensesStats, date_range_); - bool show_nothing = !frame_->expandedBankAccounts() && !frame_->expandedTermAccounts(); - bool show_all = (frame_->expandedBankAccounts() && frame_->expandedTermAccounts()) || show_nothing; - bool show_bank = frame_->expandedBankAccounts(); + bool show_nothing = !m_frame->expandedBankAccounts() && !m_frame->expandedTermAccounts(); + bool show_all = (m_frame->expandedBankAccounts() && m_frame->expandedTermAccounts()) || show_nothing; + bool show_bank = m_frame->expandedBankAccounts(); for (const auto& account : Model_Account::instance().all()) { if (!show_all) { if (show_bank && Model_Account::type(account) != Model_Account::CHECKING) continue; - if (frame_->expandedTermAccounts() && Model_Account::type(account) == Model_Account::TERM) continue; + if (m_frame->expandedTermAccounts() && Model_Account::type(account) == Model_Account::TERM) continue; } int idx = account.ACCOUNTID; tIncome += incomeExpensesStats[idx].first; Modified: trunk/src/mmhomepagepanel.h =================================================================== --- trunk/src/mmhomepagepanel.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmhomepagepanel.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -33,7 +33,7 @@ DECLARE_EVENT_TABLE() public: - mmHomePagePanel(wxWindow *parent, + mmHomePagePanel(wxWindow *parent, mmGUIFrame *frame, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -51,9 +51,10 @@ wxString BuildPage() const { return GetHomePageText(); } void PrintPage(); +public: + mmGUIFrame* m_frame; private: wxString GetHomePageText() const; - mmGUIFrame* frame_; wxWebView* browser_; mmDateRange* date_range_; void CreateControls(); Modified: trunk/src/mmreportspanel.cpp =================================================================== --- trunk/src/mmreportspanel.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmreportspanel.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -43,7 +43,7 @@ virtual wxFSFile* GetFile (const wxString &uri) { - mmGUIFrame* frame = wxGetApp().m_frame; + mmGUIFrame* frame = m_reportPanel->m_frame; wxString sData; if (uri.StartsWith("trxid:", &sData)) { @@ -81,12 +81,13 @@ END_EVENT_TABLE() mmReportsPanel::mmReportsPanel( - mmPrintableBase* rb, bool cleanupReport, wxWindow *parent, + mmPrintableBase* rb, bool cleanupReport, wxWindow *parent, mmGUIFrame* frame, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : rb_(rb) , cleanup_(cleanupReport) +, m_frame(frame) { Create(parent, winid, pos, size, style, name); } @@ -124,7 +125,7 @@ o["version"] = json::String(rb_->version().ToStdString()); o["start"] = json::String(wxDateTime::Now().FormatISOCombined().ToStdString()); - wxGetApp().m_frame->SetStatusText(rb_->version()); + m_frame->SetStatusText(rb_->version()); htmlreport_ = rb_->getHTMLText(); wxFileOutputStream index_output(mmex::getReportIndex()); Modified: trunk/src/mmreportspanel.h =================================================================== --- trunk/src/mmreportspanel.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/mmreportspanel.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -21,7 +21,7 @@ #include "mmpanelbase.h" #include "reports/reportbase.h" - +class mmGUIFrame; class mmReportsPanel : public mmPanelBase { DECLARE_EVENT_TABLE() @@ -30,6 +30,7 @@ mmReportsPanel(mmPrintableBase* rb, bool cleanupReport, wxWindow *parent, + mmGUIFrame *frame, wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -59,6 +60,8 @@ private: bool cleanup_; wxString htmlreport_; +public: + mmGUIFrame *m_frame; }; #endif Modified: trunk/src/optionsdialog.cpp =================================================================== --- trunk/src/optionsdialog.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/optionsdialog.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -21,6 +21,7 @@ #include "maincurrencydialog.h" #include "attachmentdialog.h" #include "util.h" +#include "mmex.h" #include "mmOption.h" #include <wx/colordlg.h> #include "constants.h" @@ -101,7 +102,7 @@ delete m_imageList; } -mmOptionsDialog::mmOptionsDialog(wxWindow* parent) +mmOptionsDialog::mmOptionsDialog(wxWindow* parent, mmGUIApp* app): m_app(app) { long style = wxCAPTION | wxRESIZE_BORDER | wxSYSTEM_MENU | wxCLOSE_BOX; Create(parent, wxID_ANY, _("New MMEX Options"), wxDefaultPosition, wxSize(500, 400), style); @@ -886,7 +887,7 @@ void mmOptionsDialog::OnLanguageChanged(wxCommandEvent& /*event*/) { - wxString lang = mmSelectLanguage(this, true, false); + wxString lang = mmSelectLanguage(this->m_app, this, true, false); if (lang.empty()) return; wxButton *btn = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_LANGUAGE); @@ -1091,7 +1092,7 @@ wxButton *languageButton = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_LANGUAGE); Model_Setting::instance().Set(LANGUAGE_PARAMETER, languageButton->GetLabel().Lower()); - mmSelectLanguage(this, false); + mmSelectLanguage(this->m_app, this, false); Model_Infotable::instance().SetBaseCurrencyID(currencyId_); Model_Infotable::instance().Set("DATEFORMAT", dateFormat_); Modified: trunk/src/optionsdialog.h =================================================================== --- trunk/src/optionsdialog.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/optionsdialog.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -24,6 +24,8 @@ #include "defs.h" #include <wx/spinctrl.h> +class mmGUIApp; + class mmOptionsDialog: public wxDialog { DECLARE_DYNAMIC_CLASS( mmOptionsDialog ) @@ -31,11 +33,13 @@ public: mmOptionsDialog( ); - mmOptionsDialog(wxWindow* parent); + mmOptionsDialog(wxWindow* parent, mmGUIApp* app); ~mmOptionsDialog( ); +public: /// Saves the updated System Options to the appropriate databases. void SaveNewSystemSettings(); + mmGUIApp* m_app; private: /// Dialog Creation - Used by constructor bool Create(wxWindow* parent, wxWindowID id, Modified: trunk/src/reports/budget.cpp =================================================================== --- trunk/src/reports/budget.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/reports/budget.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -70,7 +70,7 @@ wxString mmReportBudget::AdjustYearValues(int& day, int& month, long year, wxString yearStr) { if ((yearStr.length() < 5)) { - if (wxGetApp().m_frame->budgetFinancialYears() ) { + if (mmIniOptions::instance().budgetFinancialYears_) { GetFinancialYearValues(day, month); yearStr = wxString() << _("Financial Year: ") << yearStr << " - " << (year + 1); } else @@ -84,7 +84,7 @@ void mmReportBudget::AdjustYearValues(int& day, int& month, wxDateTime& year) { - if (wxGetApp().m_frame->budgetFinancialYears() ) { + if (mmIniOptions::instance().budgetFinancialYears_) { GetFinancialYearValues(day, month); SetDateToEndOfYear(day, month, year, false); } @@ -92,7 +92,7 @@ void mmReportBudget::AdjustDateForEndFinancialYear(wxDateTime& date) { - if (wxGetApp().m_frame->budgetFinancialYears() ) + if (mmIniOptions::instance().budgetFinancialYears_) { int day, month; GetFinancialYearValues(day, month); Modified: trunk/src/reports/budgetcategorysummary.cpp =================================================================== --- trunk/src/reports/budgetcategorysummary.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/reports/budgetcategorysummary.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -80,7 +80,7 @@ mmSpecifiedRange date_range(yearBegin, yearEnd); bool evaluateTransfer = false; - if (wxGetApp().m_frame->budgetTransferTotal()) + if (mmIniOptions::instance().budgetIncludeTransfers_) { evaluateTransfer = true; } @@ -95,7 +95,7 @@ mmHTMLBuilder hb; hb.init(); wxString headerStartupMsg; - if (wxGetApp().m_frame->budgetCategoryTotal()) + if (mmIniOptions::instance().budgetSummaryWithoutCategories_) headerStartupMsg = _("Budget Categories for "); else headerStartupMsg = _("Budget Category Summary for "); @@ -145,7 +145,7 @@ catTotalsActual += actual; catTotalsEstimated += estimated; /***************************************************************************/ - if (wxGetApp().m_frame->budgetCategoryTotal()) + if (mmIniOptions::instance().budgetSummaryWithoutCategories_) { double amt = budgetAmt[category.second.first][category.second.second]; hb.startTableRow(); @@ -164,7 +164,7 @@ if (categID != category.second.first || category.second.second == Model_Category::all_categories().rbegin()->second.second) { - if (wxGetApp().m_frame->budgetCategoryTotal()) { + if (mmIniOptions::instance().budgetSummaryWithoutCategories_) { hb.addRowSeparator(6); } // Category, Sub Category, Period, Amount, Estimated, Actual Modified: trunk/src/reports/budgetingperf.cpp =================================================================== --- trunk/src/reports/budgetingperf.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/reports/budgetingperf.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -81,7 +81,7 @@ mmSpecifiedRange date_range(yearBegin, yearEnd); bool evaluateTransfer = false; - if (wxGetApp().m_frame->budgetTransferTotal()) + if (mmIniOptions::instance().budgetIncludeTransfers_) { evaluateTransfer = true; } Modified: trunk/src/reports/cashflow.cpp =================================================================== --- trunk/src/reports/cashflow.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/reports/cashflow.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -354,7 +354,7 @@ bool addSeparator = false; bool addSeparatorAfter = false; - if (wxGetApp().m_frame->budgetFinancialYears()) + if (mmIniOptions::instance().budgetFinancialYears_) { if (initialMonths && (dtEnd.GetMonth() == getUserDefinedFinancialYear().GetMonth())) { Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/util.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -82,12 +82,12 @@ locale.AddCatalog(lang) calls wxLogWarning and returns true for corrupted .mo file, so I should use locale.IsLoaded(lang) also. */ -const wxString mmSelectLanguage(wxWindow *parent, bool forced_show_dlg, bool save_setting) +const wxString mmSelectLanguage(mmGUIApp *app, wxWindow* window, bool forced_show_dlg, bool save_setting) { wxString lang; const wxString langPath = mmex::getPathShared(mmex::LANG_DIR); - wxLocale &locale = wxGetApp().getLocale(); + wxLocale &locale = app->getLocale(); if (wxDir::Exists(langPath)) { @@ -97,7 +97,7 @@ { if (forced_show_dlg) { - wxMessageDialog dlg(parent + wxMessageDialog dlg(window , wxString::Format(_("Directory of language files does not exist:\n%s"), langPath) , _("Error"), wxOK | wxICON_ERROR); dlg.ShowModal(); @@ -116,7 +116,7 @@ } } - lang = selectLanguageDlg(parent, langPath, forced_show_dlg); + lang = selectLanguageDlg(window, langPath, forced_show_dlg); if (save_setting && !lang.empty()) { Modified: trunk/src/util.h =================================================================== --- trunk/src/util.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/src/util.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -24,6 +24,7 @@ #include <wx/valnum.h> #include <map> +class mmGUIApp; struct ValuePair { wxString label; @@ -115,7 +116,7 @@ void mmMessagePayeeInvalid(wxComboBox *comboBox); void mmMessageNameInvalid(wxTextCtrl *textBox); -const wxString mmSelectLanguage(wxWindow *parent, bool forced_show_dlg, bool save_setting = true); +const wxString mmSelectLanguage(mmGUIApp *app, wxWindow* window, bool forced_show_dlg, bool save_setting = true); const wxDateTime mmGetStorageStringAsDate(const wxString& str); const wxString mmGetDateForDisplay(const wxDateTime &dt); Modified: trunk/tests/Makefile.in =================================================================== --- trunk/tests/Makefile.in 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/tests/Makefile.in 2014-05-16 03:32:24 UTC (rev 6592) @@ -144,15 +144,15 @@ -I$(srcdir)/../lib -I$(srcdir)/../3rd -I$(srcdir)/../3rd/LuaGlue/include \ -I$(srcdir)/../3rd/cgitemplate -I$(srcdir)/../3rd/csv-parser/include \ -I$(srcdir)/../src -DNOPCH -I$(srcdir)/../src \ - -I$(srcdir)/../lib/cppunit/include $(WX_CFLAGS) $(PIC_FLAG) $(CPPFLAGS) \ - $(CFLAGS) + -I$(srcdir)/../lib/cppunit/include -DwxIMPLEMENT_WXWIN_MAIN= $(WX_CFLAGS) \ + $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) MMEX_TESTS_CXXFLAGS = -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ -I$(srcdir)/../lib/wxsqlite3/include -I$(srcdir)/../lib/lua/src \ -I$(srcdir)/../lib -I$(srcdir)/../3rd -I$(srcdir)/../3rd/LuaGlue/include \ -I$(srcdir)/../3rd/cgitemplate -I$(srcdir)/../3rd/csv-parser/include \ -I$(srcdir)/../src -DNOPCH -I$(srcdir)/../src \ - -I$(srcdir)/../lib/cppunit/include $(WX_CXXFLAGS) $(PIC_FLAG) $(CPPFLAGS) \ - $(CXXFLAGS) + -I$(srcdir)/../lib/cppunit/include -DwxIMPLEMENT_WXWIN_MAIN= \ + $(WX_CXXFLAGS) $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) MMEX_TESTS_OBJECTS = \ mmex_tests_aboutdialog.o \ mmex_tests_accountdialog.o \ @@ -899,7 +899,7 @@ $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_stocks.cpp mmex_tests_mmex_tests_rc.o: $(srcdir)/../tests/mmex_tests.rc - $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/../lib/wxsqlite3/sqlite3/secure/src --include-dir $(srcdir)/../lib/wxsqlite3/include --include-dir $(srcdir)/../lib/lua/src --include-dir $(srcdir)/../lib --include-dir $(srcdir)/../3rd --include-dir $(srcdir)/../3rd/LuaGlue/include --include-dir $(srcdir)/../3rd/cgitemplate --include-dir $(srcdir)/../3rd/csv-parser/include --include-dir $(srcdir)/../src --define NOPCH --include-dir $(srcdir)/../src --include-dir $(srcdir)/../lib/cppunit/include + $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/../lib/wxsqlite3/sqlite3/secure/src --include-dir $(srcdir)/../lib/wxsqlite3/include --include-dir $(srcdir)/../lib/lua/src --include-dir $(srcdir)/../lib --include-dir $(srcdir)/../3rd --include-dir $(srcdir)/../3rd/LuaGlue/include --include-dir $(srcdir)/../3rd/cgitemplate --include-dir $(srcdir)/../3rd/csv-parser/include --include-dir $(srcdir)/../src --define NOPCH --include-dir $(srcdir)/../src --include-dir $(srcdir)/../lib/cppunit/include --define wxIMPLEMENT_WXWIN_MAIN= # Include dependency info, if present: Modified: trunk/tests/cpu_timer.cpp =================================================================== --- trunk/tests/cpu_timer.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/tests/cpu_timer.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -20,7 +20,7 @@ #include <iostream> //---------------------------------------------------------------------------- -CpuTimer::CpuTimer(const wxString msg) +CpuTimer::CpuTimer(const wxString& msg) { m_message = msg; } Modified: trunk/tests/cpu_timer.h =================================================================== --- trunk/tests/cpu_timer.h 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/tests/cpu_timer.h 2014-05-16 03:32:24 UTC (rev 6592) @@ -23,7 +23,7 @@ class CpuTimer { public: - CpuTimer(const wxString msg = "Test"); + CpuTimer(const wxString& msg = "Test"); ~CpuTimer(); private: Modified: trunk/tests/test_checking.cpp =================================================================== --- trunk/tests/test_checking.cpp 2014-05-16 01:59:51 UTC (rev 6591) +++ trunk/tests/test_checking.cpp 2014-05-16 03:32:24 UTC (rev 6592) @@ -430,7 +430,7 @@ CpuTimer* panel_timer = new CpuTimer("Account_View: NAB - Savings"); // Create the panel under test - mmCheckingPanel* account_panel = new mmCheckingPanel(account_id, account_frame); + mmCheckingPanel* account_panel = new mmCheckingPanel(account_id, account_frame, 0); account_panel->Show(); delete panel_timer; // Kill the timer to determine speed of activation. @@ -453,7 +453,7 @@ CpuTimer* panel_timer = new CpuTimer("Account_View: Wallet - Mary"); // Create the panel under test - mmCheckingPanel* account_panel = new mmCheckingPanel(account_id, account_frame); + mmCheckingPanel* account_panel = new mmCheckingPanel(account_id, account_frame, 0); account_panel->Show(); delete panel_timer; // Kill the timer to determine speed of activation. This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-16 01:59:56
|
Revision: 6591 http://sourceforge.net/p/moneymanagerex/code/6591 Author: guanlisheng Date: 2014-05-16 01:59:51 +0000 (Fri, 16 May 2014) Log Message: ----------- rename check to test Modified Paths: -------------- trunk/build/bakefiles/mmex.bkl trunk/build/msw/makefile.gcc trunk/build/msw/makefile.vc Modified: trunk/build/bakefiles/mmex.bkl =================================================================== --- trunk/build/bakefiles/mmex.bkl 2014-05-15 15:03:12 UTC (rev 6590) +++ trunk/build/bakefiles/mmex.bkl 2014-05-16 01:59:51 UTC (rev 6591) @@ -304,12 +304,11 @@ <!-- unit tests target (not dependency of 'all'): --> - <subproject id="check"> - - <target>check</target> + <subproject id="test"> + <target>all</target> <installable>no</installable> - <dir cond="FORMAT=='autoconf'">$(BUILDDIR)/tests</dir> + <dir cond="FORMAT=='autoconf'">$(SRCDIR)/tests</dir> <dir cond="FORMAT!='autoconf'">tests</dir> </subproject> Modified: trunk/build/msw/makefile.gcc =================================================================== --- trunk/build/msw/makefile.gcc 2014-05-15 15:03:12 UTC (rev 6590) +++ trunk/build/msw/makefile.gcc 2014-05-16 01:59:51 UTC (rev 6591) @@ -413,8 +413,8 @@ setup: all $(MAKE) -C ..\..\setup\win -f makefile.gcc $(MAKEARGS) APP_EXE_PATH="..\..\build\msw\mmex.exe" BUILD_OPTS="$(__setup_SHARED)$(__setup_UNICODE)$(__setup_DEBUG)-x86" CPU_ARCH="x86" CRT_DLLS="$(MINGWDIR)\bin\libgcc_s_*.dll" FORMAT="mingw" all -check: - $(MAKE) -C tests -f makefile.gcc $(MAKEARGS) check +test: + $(MAKE) -C tests -f makefile.gcc $(MAKEARGS) all wxsqlite_wxsqlite3.o: ../../lib/wxsqlite3/src/wxsqlite3.cpp $(CXX) -c -o $@ $(WXSQLITE_CXXFLAGS) $(CPPDEPS) $< @@ -803,7 +803,7 @@ mmex_resources_mmex_rc.o: ../../resources/mmex.rc windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_17_p_1) $(__WXUNICODE_DEFINE_p_2) $(__WXDEBUG_DEFINE_p_2) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_3) --include-dir ../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../lib/wxsqlite3/include --include-dir ../../lib/lua/src --include-dir ../../lib --include-dir ../../3rd --include-dir ../../3rd/LuaGlue/include --include-dir ../../3rd/cgitemplate --include-dir ../../3rd/csv-parser/include --include-dir ../../src --define NOPCH -.PHONY: all install uninstall clean install_mmex uninstall_mmex po setup check +.PHONY: all install uninstall clean install_mmex uninstall_mmex po setup test SHELL := $(COMSPEC) Modified: trunk/build/msw/makefile.vc =================================================================== --- trunk/build/msw/makefile.vc 2014-05-15 15:03:12 UTC (rev 6590) +++ trunk/build/msw/makefile.vc 2014-05-16 01:59:51 UTC (rev 6591) @@ -539,9 +539,9 @@ $(MAKE) -f makefile.vc $(MAKEARGS) APP_EXE_PATH="..\..\build\msw\mmex.exe" BUILD_OPTS="$(__setup_SHARED)$(__setup_UNICODE)$(__setup_DEBUG)-$(CPU_ARCH)" CPU_ARCH="$(CPU_ARCH)" CRT_DLLS="$(__setup_CRT_DLLS)" FORMAT="msvc" all cd "$(MAKEDIR)" -sub_check: +sub_test: cd tests - $(MAKE) -f makefile.vc $(MAKEARGS) check + $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" wxsqlite_wxsqlite3.obj: ..\..\lib\wxsqlite3\src\wxsqlite3.cpp This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-15 15:03:15
|
Revision: 6590 http://sourceforge.net/p/moneymanagerex/code/6590 Author: guanlisheng Date: 2014-05-15 15:03:12 +0000 (Thu, 15 May 2014) Log Message: ----------- fix once; Modified Paths: -------------- trunk/tests/test_callback_hooks.h trunk/tests/test_checking.h trunk/tests/test_currency.h trunk/tests/test_database_initialisation.h trunk/tests/test_date_range.h trunk/tests/test_stocks.h Modified: trunk/tests/test_callback_hooks.h =================================================================== --- trunk/tests/test_callback_hooks.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_callback_hooks.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <wx/intl.h> #include <cppunit/extensions/HelperMacros.h> Modified: trunk/tests/test_checking.h =================================================================== --- trunk/tests/test_checking.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_checking.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <cppunit/extensions/HelperMacros.h> //---------------------------------------------------------------------------- Modified: trunk/tests/test_currency.h =================================================================== --- trunk/tests/test_currency.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_currency.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <wx/intl.h> Modified: trunk/tests/test_database_initialisation.h =================================================================== --- trunk/tests/test_database_initialisation.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_database_initialisation.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <cppunit/extensions/HelperMacros.h> //---------------------------------------------------------------------------- Modified: trunk/tests/test_date_range.h =================================================================== --- trunk/tests/test_date_range.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_date_range.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <cppunit/extensions/HelperMacros.h> //---------------------------------------------------------------------------- Modified: trunk/tests/test_stocks.h =================================================================== --- trunk/tests/test_stocks.h 2014-05-15 15:01:33 UTC (rev 6589) +++ trunk/tests/test_stocks.h 2014-05-15 15:03:12 UTC (rev 6590) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <cppunit/extensions/HelperMacros.h> //---------------------------------------------------------------------------- This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-15 15:01:36
|
Revision: 6589 http://sourceforge.net/p/moneymanagerex/code/6589 Author: guanlisheng Date: 2014-05-15 15:01:33 +0000 (Thu, 15 May 2014) Log Message: ----------- use capital regular Modified Paths: -------------- trunk/tests/framebase_tests.h trunk/tests/test_assets.h Modified: trunk/tests/framebase_tests.h =================================================================== --- trunk/tests/framebase_tests.h 2014-05-15 14:59:50 UTC (rev 6588) +++ trunk/tests/framebase_tests.h 2014-05-15 15:01:33 UTC (rev 6589) @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Placeuite 330, Boston, MA 02111-1307 USA ********************************************************/ -#include "../mmHook.h" +#include "mmHook.h" //---------------------------------------------------------------------------- class wxFrame; class wxInfoBar; Modified: trunk/tests/test_assets.h =================================================================== --- trunk/tests/test_assets.h 2014-05-15 14:59:50 UTC (rev 6588) +++ trunk/tests/test_assets.h 2014-05-15 15:01:33 UTC (rev 6589) @@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#pragma once; +#pragma once //---------------------------------------------------------------------------- #include <cppunit/extensions/HelperMacros.h> //---------------------------------------------------------------------------- This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-15 14:59:56
|
Revision: 6588 http://sourceforge.net/p/moneymanagerex/code/6588 Author: guanlisheng Date: 2014-05-15 14:59:50 +0000 (Thu, 15 May 2014) Log Message: ----------- use capital regular Modified Paths: -------------- trunk/build/bakefiles/cppunit.bkl Modified: trunk/build/bakefiles/cppunit.bkl =================================================================== --- trunk/build/bakefiles/cppunit.bkl 2014-05-15 14:59:12 UTC (rev 6587) +++ trunk/build/bakefiles/cppunit.bkl 2014-05-15 14:59:50 UTC (rev 6588) @@ -21,7 +21,7 @@ <include>$(SRCDIR)/$(SRC)/include</include> <headers>$(fileList( [ SRC + '/include/cppunit/*.h', SRC + '/include/cppunit/*/*.h', SRC + '/include/cppunit/ui/text/*.h' ] ))</headers> - <sources>$(fileList( [ SRC + '/src/cppunit/[a-ce-z]*.cpp', SRC + '/src/cppunit/d[a-km-z]*.cpp' ] ))</sources> + <sources>$(fileList( [ SRC + '/src/cppunit/[A-CE-Z]*.cpp', SRC + '/src/cppunit/D[a-km-z]*.cpp' ] ))</sources> </lib> This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-15 14:59:15
|
Revision: 6587 http://sourceforge.net/p/moneymanagerex/code/6587 Author: guanlisheng Date: 2014-05-15 14:59:12 +0000 (Thu, 15 May 2014) Log Message: ----------- use capital regular Modified Paths: -------------- trunk/tests/Makefile.in Modified: trunk/tests/Makefile.in =================================================================== --- trunk/tests/Makefile.in 2014-05-15 14:43:08 UTC (rev 6586) +++ trunk/tests/Makefile.in 2014-05-15 14:59:12 UTC (rev 6587) @@ -87,6 +87,58 @@ lua_lundump.o \ lua_lvm.o \ lua_lzio.o +CPPUNIT_CXXFLAGS = -I$(srcdir)/../lib/cppunit/include $(PIC_FLAG) \ + $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) +CPPUNIT_OBJECTS = \ + cppunit_AdditionalMessage.o \ + cppunit_Asserter.o \ + cppunit_BeOsDynamicLibraryManager.o \ + cppunit_BriefTestProgressListener.o \ + cppunit_CompilerOutputter.o \ + cppunit_Exception.o \ + cppunit_Message.o \ + cppunit_PlugInManager.o \ + cppunit_PlugInParameters.o \ + cppunit_Protector.o \ + cppunit_ProtectorChain.o \ + cppunit_RepeatedTest.o \ + cppunit_ShlDynamicLibraryManager.o \ + cppunit_SourceLine.o \ + cppunit_StringTools.o \ + cppunit_SynchronizedObject.o \ + cppunit_Test.o \ + cppunit_TestAssert.o \ + cppunit_TestCase.o \ + cppunit_TestCaseDecorator.o \ + cppunit_TestComposite.o \ + cppunit_TestDecorator.o \ + cppunit_TestFactoryRegistry.o \ + cppunit_TestFailure.o \ + cppunit_TestLeaf.o \ + cppunit_TestNamer.o \ + cppunit_TestPath.o \ + cppunit_TestPlugInDefaultImpl.o \ + cppunit_TestResult.o \ + cppunit_TestResultCollector.o \ + cppunit_TestRunner.o \ + cppunit_TestSetUp.o \ + cppunit_TestSuccessListener.o \ + cppunit_TestSuite.o \ + cppunit_TestSuiteBuilderContext.o \ + cppunit_TextOutputter.o \ + cppunit_TextTestProgressListener.o \ + cppunit_TextTestResult.o \ + cppunit_TextTestRunner.o \ + cppunit_TypeInfoHelper.o \ + cppunit_UnixDynamicLibraryManager.o \ + cppunit_Win32DynamicLibraryManager.o \ + cppunit_XmlDocument.o \ + cppunit_XmlElement.o \ + cppunit_XmlOutputter.o \ + cppunit_XmlOutputterHook.o \ + cppunit_DefaultProtector.o \ + cppunit_DynamicLibraryManager.o \ + cppunit_DynamicLibraryManagerException.o MMEX_TESTS_CFLAGS = -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ -I$(srcdir)/../lib/wxsqlite3/include -I$(srcdir)/../lib/lua/src \ -I$(srcdir)/../lib -I$(srcdir)/../3rd -I$(srcdir)/../3rd/LuaGlue/include \ @@ -254,9 +306,9 @@ $(AR) $(AROPTIONS) $@ $(LUA_OBJECTS) $(RANLIB) $@ -$(LIBPREFIX)cppunit$(LIBEXT): +$(LIBPREFIX)cppunit$(LIBEXT): $(CPPUNIT_OBJECTS) rm -f $@ - $(AR) $(AROPTIONS) $@ + $(AR) $(AROPTIONS) $@ $(CPPUNIT_OBJECTS) $(RANLIB) $@ mmex_tests$(EXEEXT): $(MMEX_TESTS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT) $(LIBPREFIX)lua$(LIBEXT) $(LIBPREFIX)cppunit$(LIBEXT) $(__mmex_tests___win32rc) @@ -375,6 +427,153 @@ lua_lzio.o: $(srcdir)/../lib/lua/src/lzio.c $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lzio.c +cppunit_AdditionalMessage.o: $(srcdir)/../lib/cppunit/src/cppunit/AdditionalMessage.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/AdditionalMessage.cpp + +cppunit_Asserter.o: $(srcdir)/../lib/cppunit/src/cppunit/Asserter.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Asserter.cpp + +cppunit_BeOsDynamicLibraryManager.o: $(srcdir)/../lib/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp + +cppunit_BriefTestProgressListener.o: $(srcdir)/../lib/cppunit/src/cppunit/BriefTestProgressListener.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/BriefTestProgressListener.cpp + +cppunit_CompilerOutputter.o: $(srcdir)/../lib/cppunit/src/cppunit/CompilerOutputter.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/CompilerOutputter.cpp + +cppunit_Exception.o: $(srcdir)/../lib/cppunit/src/cppunit/Exception.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Exception.cpp + +cppunit_Message.o: $(srcdir)/../lib/cppunit/src/cppunit/Message.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Message.cpp + +cppunit_PlugInManager.o: $(srcdir)/../lib/cppunit/src/cppunit/PlugInManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/PlugInManager.cpp + +cppunit_PlugInParameters.o: $(srcdir)/../lib/cppunit/src/cppunit/PlugInParameters.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/PlugInParameters.cpp + +cppunit_Protector.o: $(srcdir)/../lib/cppunit/src/cppunit/Protector.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Protector.cpp + +cppunit_ProtectorChain.o: $(srcdir)/../lib/cppunit/src/cppunit/ProtectorChain.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/ProtectorChain.cpp + +cppunit_RepeatedTest.o: $(srcdir)/../lib/cppunit/src/cppunit/RepeatedTest.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/RepeatedTest.cpp + +cppunit_ShlDynamicLibraryManager.o: $(srcdir)/../lib/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp + +cppunit_SourceLine.o: $(srcdir)/../lib/cppunit/src/cppunit/SourceLine.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/SourceLine.cpp + +cppunit_StringTools.o: $(srcdir)/../lib/cppunit/src/cppunit/StringTools.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/StringTools.cpp + +cppunit_SynchronizedObject.o: $(srcdir)/../lib/cppunit/src/cppunit/SynchronizedObject.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/SynchronizedObject.cpp + +cppunit_Test.o: $(srcdir)/../lib/cppunit/src/cppunit/Test.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Test.cpp + +cppunit_TestAssert.o: $(srcdir)/../lib/cppunit/src/cppunit/TestAssert.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestAssert.cpp + +cppunit_TestCase.o: $(srcdir)/../lib/cppunit/src/cppunit/TestCase.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestCase.cpp + +cppunit_TestCaseDecorator.o: $(srcdir)/../lib/cppunit/src/cppunit/TestCaseDecorator.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestCaseDecorator.cpp + +cppunit_TestComposite.o: $(srcdir)/../lib/cppunit/src/cppunit/TestComposite.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestComposite.cpp + +cppunit_TestDecorator.o: $(srcdir)/../lib/cppunit/src/cppunit/TestDecorator.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestDecorator.cpp + +cppunit_TestFactoryRegistry.o: $(srcdir)/../lib/cppunit/src/cppunit/TestFactoryRegistry.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestFactoryRegistry.cpp + +cppunit_TestFailure.o: $(srcdir)/../lib/cppunit/src/cppunit/TestFailure.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestFailure.cpp + +cppunit_TestLeaf.o: $(srcdir)/../lib/cppunit/src/cppunit/TestLeaf.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestLeaf.cpp + +cppunit_TestNamer.o: $(srcdir)/../lib/cppunit/src/cppunit/TestNamer.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestNamer.cpp + +cppunit_TestPath.o: $(srcdir)/../lib/cppunit/src/cppunit/TestPath.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestPath.cpp + +cppunit_TestPlugInDefaultImpl.o: $(srcdir)/../lib/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp + +cppunit_TestResult.o: $(srcdir)/../lib/cppunit/src/cppunit/TestResult.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestResult.cpp + +cppunit_TestResultCollector.o: $(srcdir)/../lib/cppunit/src/cppunit/TestResultCollector.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestResultCollector.cpp + +cppunit_TestRunner.o: $(srcdir)/../lib/cppunit/src/cppunit/TestRunner.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestRunner.cpp + +cppunit_TestSetUp.o: $(srcdir)/../lib/cppunit/src/cppunit/TestSetUp.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestSetUp.cpp + +cppunit_TestSuccessListener.o: $(srcdir)/../lib/cppunit/src/cppunit/TestSuccessListener.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestSuccessListener.cpp + +cppunit_TestSuite.o: $(srcdir)/../lib/cppunit/src/cppunit/TestSuite.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestSuite.cpp + +cppunit_TestSuiteBuilderContext.o: $(srcdir)/../lib/cppunit/src/cppunit/TestSuiteBuilderContext.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TestSuiteBuilderContext.cpp + +cppunit_TextOutputter.o: $(srcdir)/../lib/cppunit/src/cppunit/TextOutputter.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TextOutputter.cpp + +cppunit_TextTestProgressListener.o: $(srcdir)/../lib/cppunit/src/cppunit/TextTestProgressListener.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TextTestProgressListener.cpp + +cppunit_TextTestResult.o: $(srcdir)/../lib/cppunit/src/cppunit/TextTestResult.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TextTestResult.cpp + +cppunit_TextTestRunner.o: $(srcdir)/../lib/cppunit/src/cppunit/TextTestRunner.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TextTestRunner.cpp + +cppunit_TypeInfoHelper.o: $(srcdir)/../lib/cppunit/src/cppunit/TypeInfoHelper.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/TypeInfoHelper.cpp + +cppunit_UnixDynamicLibraryManager.o: $(srcdir)/../lib/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp + +cppunit_Win32DynamicLibraryManager.o: $(srcdir)/../lib/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp + +cppunit_XmlDocument.o: $(srcdir)/../lib/cppunit/src/cppunit/XmlDocument.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/XmlDocument.cpp + +cppunit_XmlElement.o: $(srcdir)/../lib/cppunit/src/cppunit/XmlElement.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/XmlElement.cpp + +cppunit_XmlOutputter.o: $(srcdir)/../lib/cppunit/src/cppunit/XmlOutputter.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/XmlOutputter.cpp + +cppunit_XmlOutputterHook.o: $(srcdir)/../lib/cppunit/src/cppunit/XmlOutputterHook.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/XmlOutputterHook.cpp + +cppunit_DefaultProtector.o: $(srcdir)/../lib/cppunit/src/cppunit/DefaultProtector.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/DefaultProtector.cpp + +cppunit_DynamicLibraryManager.o: $(srcdir)/../lib/cppunit/src/cppunit/DynamicLibraryManager.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/DynamicLibraryManager.cpp + +cppunit_DynamicLibraryManagerException.o: $(srcdir)/../lib/cppunit/src/cppunit/DynamicLibraryManagerException.cpp + $(CXXC) -c -o $@ $(CPPUNIT_CXXFLAGS) $(srcdir)/../lib/cppunit/src/cppunit/DynamicLibraryManagerException.cpp + mmex_tests_aboutdialog.o: $(srcdir)/../src/aboutdialog.cpp $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/aboutdialog.cpp This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-15 14:43:14
|
Revision: 6586 http://sourceforge.net/p/moneymanagerex/code/6586 Author: guanlisheng Date: 2014-05-15 14:43:08 +0000 (Thu, 15 May 2014) Log Message: ----------- re order the source folder Modified Paths: -------------- trunk/build/bakefiles/Bakefiles.bkgen trunk/build/bakefiles/cppunit.bkl trunk/build/bakefiles/mmex.bkl trunk/build/bakefiles/mmex_tests.bkl trunk/build/msw/tests/makefile.gcc trunk/build/msw/tests/makefile.vc trunk/build/msw/tests/mmex_tests_cppunit.vcproj trunk/build/msw/tests/mmex_tests_lua.vcproj trunk/build/msw/tests/mmex_tests_mmex_tests.vcproj trunk/build/msw/tests/mmex_tests_wxsqlite.vcproj trunk/configure.ac Removed Paths: ------------- trunk/src/tests/ Modified: trunk/build/bakefiles/Bakefiles.bkgen =================================================================== --- trunk/build/bakefiles/Bakefiles.bkgen 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/bakefiles/Bakefiles.bkgen 2014-05-15 14:43:08 UTC (rev 6586) @@ -59,7 +59,7 @@ </add-flags> <add-flags files="mmex_tests.bkl" formats="autoconf"> - -o../../src/tests/Makefile.in + -o../../tests/Makefile.in </add-flags> <add-flags files="mmex_tests.bkl" formats="mingw"> -o../msw/tests/makefile.gcc Modified: trunk/build/bakefiles/cppunit.bkl =================================================================== --- trunk/build/bakefiles/cppunit.bkl 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/bakefiles/cppunit.bkl 2014-05-15 14:43:08 UTC (rev 6586) @@ -9,7 +9,7 @@ <makefile> - <lib id="cppunit" template="compiler_common"> + <lib id="cppunit" template="compiler_common,wx-lib"> <cxx-exceptions>on</cxx-exceptions> <cxx-rtti>on</cxx-rtti> Modified: trunk/build/bakefiles/mmex.bkl =================================================================== --- trunk/build/bakefiles/mmex.bkl 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/bakefiles/mmex.bkl 2014-05-15 14:43:08 UTC (rev 6586) @@ -309,7 +309,7 @@ <target>check</target> <installable>no</installable> - <dir cond="FORMAT=='autoconf'">$(BUILDDIR)/src/tests</dir> + <dir cond="FORMAT=='autoconf'">$(BUILDDIR)/tests</dir> <dir cond="FORMAT!='autoconf'">tests</dir> </subproject> Modified: trunk/build/bakefiles/mmex_tests.bkl =================================================================== --- trunk/build/bakefiles/mmex_tests.bkl 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/bakefiles/mmex_tests.bkl 2014-05-15 14:43:08 UTC (rev 6586) @@ -10,22 +10,20 @@ <makefile> <!-- Default root of sources is dir where output script will be created. - autoconf generates Makefile in trunk/mmex/src/tests but others in trunk/mmex/build/msw/tests. + autoconf generates Makefile in trunk/mmex/tests but others in trunk/mmex/build/msw/tests. --> - <if cond="FORMAT=='autoconf'"> - <set-srcdir>../..</set-srcdir> + <set-srcdir>..</set-srcdir> </if> <if cond="FORMAT!='autoconf'"> - <set-srcdir>../../..</set-srcdir> + <set-srcdir>../..</set-srcdir> </if> <include file="common.bkl"/> <include file="cppunit.bkl"/> - <!-- unit tests console application --> <exe id="mmex_tests" template="mmex_common"> @@ -43,7 +41,7 @@ <!-- relative to trunk/mmex --> - <set var="SRC">src/tests</set> + <set var="SRC">tests</set> <headers>$(fileList(SRC + '/*.h'))</headers> <sources>$(fileList(SRC + '/*.cpp'))</sources> @@ -89,6 +87,4 @@ </command> </action> - - </makefile> Modified: trunk/build/msw/tests/makefile.gcc =================================================================== --- trunk/build/msw/tests/makefile.gcc 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/msw/tests/makefile.gcc 2014-05-15 14:43:08 UTC (rev 6586) @@ -14,189 +14,26 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP COMPILER_PREFIX = gcc -WXSQLITE_CFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED) \ +WXSQLITE_CFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG_6) \ + $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED_7_p) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -DNOPCH \ -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ - -DWXSQLITE3_HAVE_METADATA -I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - -I..\..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) -WXSQLITE_CXXFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED) \ + -DWXSQLITE3_HAVE_METADATA -I..\..\lib\wxsqlite3\sqlite3\secure\src \ + -I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) +WXSQLITE_CXXFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG_6) \ + $(__DEBUG_DEFINE_p) -DHAVE_W32API_H $(____WX_SHARED_7_p) \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -DNOPCH \ -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \ -DSQLITE_HAS_CODEC -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ - -DWXSQLITE3_HAVE_METADATA -I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - -I..\..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CXXFLAGS) + -DWXSQLITE3_HAVE_METADATA -I..\..\lib\wxsqlite3\sqlite3\secure\src \ + -I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CXXFLAGS) WXSQLITE_OBJECTS = \ wxsqlite_wxsqlite3.o \ wxsqlite_sqlite3secure.o -LUA_CFLAGS = -mthreads -W -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) \ - $(__DEBUG_DEFINE_p) $(CPPFLAGS) $(CFLAGS) -LUA_OBJECTS = \ - lua_lapi.o \ - lua_lauxlib.o \ - lua_lbaselib.o \ - lua_lbitlib.o \ - lua_lcode.o \ - lua_lcorolib.o \ - lua_lctype.o \ - lua_ldblib.o \ - lua_ldebug.o \ - lua_ldo.o \ - lua_ldump.o \ - lua_lfunc.o \ - lua_lgc.o \ - lua_linit.o \ - lua_liolib.o \ - lua_llex.o \ - lua_lmathlib.o \ - lua_lmem.o \ - lua_loadlib.o \ - lua_lobject.o \ - lua_lopcodes.o \ - lua_loslib.o \ - lua_lparser.o \ - lua_lstate.o \ - lua_lstring.o \ - lua_lstrlib.o \ - lua_ltable.o \ - lua_ltablib.o \ - lua_ltm.o \ - lua_lua.o \ - lua_luac.o \ - lua_lundump.o \ - lua_lvm.o \ - lua_lzio.o -MMEX_TESTS_CFLAGS = -DHAVE_W32API_H $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ - -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -mthreads -W \ - -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ - -I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - -I..\..\..\lib\wxsqlite3\include -I..\..\..\lib\lua\src -I..\..\..\lib \ - -I..\..\..\3rd -I..\..\..\3rd\LuaGlue\include -I..\..\..\3rd\cgitemplate \ - -I..\..\..\3rd\csv-parser\include -I..\..\..\src -DNOPCH -I..\..\..\src \ - -I..\..\..\lib\cppunit\include $(CPPFLAGS) $(CFLAGS) -MMEX_TESTS_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ - -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include -mthreads -W \ - -Wall $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ - -I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - -I..\..\..\lib\wxsqlite3\include -I..\..\..\lib\lua\src -I..\..\..\lib \ - -I..\..\..\3rd -I..\..\..\3rd\LuaGlue\include -I..\..\..\3rd\cgitemplate \ - -I..\..\..\3rd\csv-parser\include -I..\..\..\src -DNOPCH -I..\..\..\src \ - -I..\..\..\lib\cppunit\include $(CPPFLAGS) $(CXXFLAGS) MMEX_TESTS_OBJECTS = \ - mmex_tests_aboutdialog.o \ - mmex_tests_accountdialog.o \ - mmex_tests_appstartdialog.o \ - mmex_tests_assetdialog.o \ - mmex_tests_assetspanel.o \ - mmex_tests_attachmentdialog.o \ - mmex_tests_billsdepositsdialog.o \ - mmex_tests_billsdepositspanel.o \ - mmex_tests_budgetentrydialog.o \ - mmex_tests_budgetingpanel.o \ - mmex_tests_budgetyeardialog.o \ - mmex_tests_budgetyearentrydialog.o \ - mmex_tests_categdialog.o \ - mmex_tests_constants.o \ - mmex_tests_currencydialog.o \ - mmex_tests_dbwrapper.o \ - mmex_tests_filtertransdialog.o \ - mmex_tests_general_report_manager.o \ - mmex_tests_images_list.o \ - mmex_tests_maincurrencydialog.o \ - mmex_tests_minimal_editor.o \ - mmex_tests_mmCalculator.o \ - mmex_tests_mmOption.o \ - mmex_tests_mmcheckingpanel.o \ - mmex_tests_mmex.o \ - mmex_tests_mmframe.o \ - mmex_tests_mmhelppanel.o \ - mmex_tests_mmhomepagepanel.o \ - mmex_tests_mmreportspanel.o \ - mmex_tests_optionsdialog.o \ - mmex_tests_paths.o \ - mmex_tests_payeedialog.o \ - mmex_tests_recentfiles.o \ - mmex_tests_relocatecategorydialog.o \ - mmex_tests_relocatepayeedialog.o \ - mmex_tests_splitdetailsdialog.o \ - mmex_tests_splittransactionsdialog.o \ - mmex_tests_stockdialog.o \ - mmex_tests_stockspanel.o \ - mmex_tests_transdialog.o \ - mmex_tests_util.o \ - mmex_tests_webapp.o \ - mmex_tests_webserver.o \ - mmex_tests_wizard_newaccount.o \ - mmex_tests_wizard_newdb.o \ - mmex_tests_budget.o \ - mmex_tests_budgetcategorysummary.o \ - mmex_tests_budgetingperf.o \ - mmex_tests_cashflow.o \ - mmex_tests_categexp.o \ - mmex_tests_categovertimeperf.o \ - mmex_tests_chart.o \ - mmex_tests_html_widget_bills_and_deposits.o \ - mmex_tests_html_widget_stocks.o \ - mmex_tests_html_widget_top_categories.o \ - mmex_tests_htmlbuilder.o \ - mmex_tests_incexpenses.o \ - mmex_tests_mmDateRange.o \ - mmex_tests_mmgraphgenerator.o \ - mmex_tests_mmgraphincexpensesmonth.o \ - mmex_tests_mmgraphpie.o \ - mmex_tests_mmgraphtopcategories.o \ - mmex_tests_payee.o \ - mmex_tests_reportbase.o \ - mmex_tests_transactions.o \ - mmex_tests_platfdep.o \ - mmex_tests_export.o \ - mmex_tests_qif_export.o \ - mmex_tests_qif_import.o \ - mmex_tests_qif_import_gui.o \ - mmex_tests_univcsvdialog.o \ - mmex_tests_Model_Account.o \ - mmex_tests_Model_Asset.o \ - mmex_tests_Model_Attachment.o \ - mmex_tests_Model_Billsdeposits.o \ - mmex_tests_Model_Budget.o \ - mmex_tests_Model_Budgetsplittransaction.o \ - mmex_tests_Model_Budgetyear.o \ - mmex_tests_Model_Category.o \ - mmex_tests_Model_Checking.o \ - mmex_tests_Model_Currency.o \ - mmex_tests_Model_Infotable.o \ - mmex_tests_Model_Payee.o \ - mmex_tests_Model_Report.o \ - mmex_tests_Model_Setting.o \ - mmex_tests_Model_Splittransaction.o \ - mmex_tests_Model_Stock.o \ - mmex_tests_Model_Subcategory.o \ - mmex_tests_Model_Usage.o \ - mmex_tests_html_template.o \ - mmex_tests_mongoose.o \ - mmex_tests_csv_parser.o \ - mmex_tests_cpu_timer.o \ - mmex_tests_db_init_model.o \ - mmex_tests_framebase_tests.o \ - mmex_tests_mmex_tests.o \ - mmex_tests_test_about_dialog.o \ - mmex_tests_test_assets.o \ - mmex_tests_test_billsdeposits.o \ - mmex_tests_test_callback_hooks.o \ - mmex_tests_test_checking.o \ - mmex_tests_test_currency.o \ - mmex_tests_test_database_initialisation.o \ - mmex_tests_test_date_range.o \ - mmex_tests_test_filtertrans_dialog.o \ - mmex_tests_test_relocate_category.o \ - mmex_tests_test_relocate_payee.o \ - mmex_tests_test_stocks.o \ mmex_tests_mmex_tests_rc.o ### Conditionally set variables: ### @@ -204,19 +41,43 @@ ifeq ($(WX_DEBUG),1) WX3RDPARTYLIBPOSTFIX = d endif +ifeq ($(WX_DEBUG),0) +__OPTIMIZEFLAG_6 = -O2 +endif +ifeq ($(WX_DEBUG),1) +__OPTIMIZEFLAG_6 = -O0 +endif +ifeq ($(WX_DEBUG),0) +__DEBUG_DEFINE_p = -DNDEBUG +endif +ifeq ($(WX_DEBUG),1) +__DEBUG_DEFINE_p = -D_DEBUG +endif ifeq ($(WX_SHARED),0) -____WX_SHARED_26_p_1 = +____WX_SHARED_7_p = endif ifeq ($(WX_SHARED),1) -____WX_SHARED_26_p_1 = --define WXUSINGDLL +____WX_SHARED_7_p = -DWXUSINGDLL endif ifeq ($(WX_UNICODE),1) -__WXUNICODE_DEFINE_p_2 = --define _UNICODE +__WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_DEBUG),1) -__WXDEBUG_DEFINE_p_2 = --define __WXDEBUG__ +__WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ifeq ($(WX_SHARED),0) +____WX_SHARED_27_p_1 = +endif +ifeq ($(WX_SHARED),1) +____WX_SHARED_27_p_1 = --define WXUSINGDLL +endif +ifeq ($(WX_UNICODE),1) +__WXUNICODE_DEFINE_p_3 = --define _UNICODE +endif +ifeq ($(WX_DEBUG),1) +__WXDEBUG_DEFINE_p_3 = --define __WXDEBUG__ +endif +ifeq ($(WX_SHARED),0) ____mmex_tests_LIB_SUF_FILENAMES = _lib endif ifeq ($(WX_SHARED),1) @@ -261,18 +122,6 @@ ifeq ($(WX_MONOLITHIC),1) __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX) endif -ifeq ($(WX_SHARED),0) -____WX_SHARED = -endif -ifeq ($(WX_SHARED),1) -____WX_SHARED = -DWXUSINGDLL -endif -ifeq ($(WX_UNICODE),1) -__WXUNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(WX_DEBUG),1) -__WXDEBUG_DEFINE_p = -D__WXDEBUG__ -endif ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = u @@ -289,29 +138,17 @@ endif endif ifeq ($(WX_DEBUG),0) -__OPTIMIZEFLAG = -O2 +__DEBUGINFO = endif ifeq ($(WX_DEBUG),1) -__OPTIMIZEFLAG = -O0 +__DEBUGINFO = -g endif -ifeq ($(WX_DEBUG),0) -__DEBUG_DEFINE_p = -DNDEBUG -endif -ifeq ($(WX_DEBUG),1) -__DEBUG_DEFINE_p = -D_DEBUG -endif ifeq ($(WX_SHARED),0) WXLIBPATH = \lib\$(COMPILER_PREFIX)_lib endif ifeq ($(WX_SHARED),1) WXLIBPATH = \lib\$(COMPILER_PREFIX)_dll endif -ifeq ($(WX_DEBUG),0) -__DEBUGINFO = -endif -ifeq ($(WX_DEBUG),1) -__DEBUGINFO = -g -endif ### Targets: ### @@ -347,9 +184,9 @@ ar rcu $@ $(WXSQLITE_OBJECTS) ranlib $@ -liblua.a: $(LUA_OBJECTS) +liblua.a: if exist $@ del $@ - ar rcu $@ $(LUA_OBJECTS) + ar rcu $@ ranlib $@ libcppunit.a: @@ -358,446 +195,20 @@ ranlib $@ mmex_tests.exe: $(MMEX_TESTS_OBJECTS) libwxsqlite.a liblua.a libcppunit.a mmex_tests_mmex_tests_rc.o - $(CXX) -o $@ $(MMEX_TESTS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -L$(WX_DIR)\lib\gcc$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads $(__DEBUGINFO) $(LDFLAGS) libwxsqlite.a liblua.a $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 libcppunit.a + $(CC) -o $@ $(MMEX_TESTS_OBJECTS) -mthreads -L$(WX_DIR)$(WXLIBPATH) -L$(WX_DIR)\lib\gcc$(____mmex_tests_LIB_SUF_FILENAMES) -mthreads $(__DEBUGINFO) $(LDFLAGS) libwxsqlite.a liblua.a $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) -lwxscintilla$(WX3RDPARTYLIBPOSTFIX) $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 libcppunit.a check: all .\mmex_tests.exe -wxsqlite_wxsqlite3.o: ../../../lib/wxsqlite3/src/wxsqlite3.cpp +wxsqlite_wxsqlite3.o: ../../lib/wxsqlite3/src/wxsqlite3.cpp $(CXX) -c -o $@ $(WXSQLITE_CXXFLAGS) $(CPPDEPS) $< -wxsqlite_sqlite3secure.o: ../../../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c +wxsqlite_sqlite3secure.o: ../../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c $(CC) -c -o $@ $(WXSQLITE_CFLAGS) $(CPPDEPS) $< -lua_lapi.o: ../../../lib/lua/src/lapi.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< +mmex_tests_mmex_tests_rc.o: ../../tests/mmex_tests.rc + windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_27_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_4) --include-dir ../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../lib/wxsqlite3/include --include-dir ../../lib/lua/src --include-dir ../../lib --include-dir ../../3rd --include-dir ../../3rd/LuaGlue/include --include-dir ../../3rd/cgitemplate --include-dir ../../3rd/csv-parser/include --include-dir ../../src --define NOPCH --include-dir ../../src --include-dir ../../lib/cppunit/include -lua_lauxlib.o: ../../../lib/lua/src/lauxlib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lbaselib.o: ../../../lib/lua/src/lbaselib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lbitlib.o: ../../../lib/lua/src/lbitlib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lcode.o: ../../../lib/lua/src/lcode.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lcorolib.o: ../../../lib/lua/src/lcorolib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lctype.o: ../../../lib/lua/src/lctype.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ldblib.o: ../../../lib/lua/src/ldblib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ldebug.o: ../../../lib/lua/src/ldebug.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ldo.o: ../../../lib/lua/src/ldo.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ldump.o: ../../../lib/lua/src/ldump.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lfunc.o: ../../../lib/lua/src/lfunc.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lgc.o: ../../../lib/lua/src/lgc.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_linit.o: ../../../lib/lua/src/linit.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_liolib.o: ../../../lib/lua/src/liolib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_llex.o: ../../../lib/lua/src/llex.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lmathlib.o: ../../../lib/lua/src/lmathlib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lmem.o: ../../../lib/lua/src/lmem.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_loadlib.o: ../../../lib/lua/src/loadlib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lobject.o: ../../../lib/lua/src/lobject.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lopcodes.o: ../../../lib/lua/src/lopcodes.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_loslib.o: ../../../lib/lua/src/loslib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lparser.o: ../../../lib/lua/src/lparser.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lstate.o: ../../../lib/lua/src/lstate.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lstring.o: ../../../lib/lua/src/lstring.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lstrlib.o: ../../../lib/lua/src/lstrlib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ltable.o: ../../../lib/lua/src/ltable.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ltablib.o: ../../../lib/lua/src/ltablib.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_ltm.o: ../../../lib/lua/src/ltm.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lua.o: ../../../lib/lua/src/lua.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_luac.o: ../../../lib/lua/src/luac.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lundump.o: ../../../lib/lua/src/lundump.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lvm.o: ../../../lib/lua/src/lvm.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -lua_lzio.o: ../../../lib/lua/src/lzio.c - $(CC) -c -o $@ $(LUA_CFLAGS) $(CPPDEPS) $< - -mmex_tests_aboutdialog.o: ../../../src/aboutdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_accountdialog.o: ../../../src/accountdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_appstartdialog.o: ../../../src/appstartdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_assetdialog.o: ../../../src/assetdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_assetspanel.o: ../../../src/assetspanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_attachmentdialog.o: ../../../src/attachmentdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_billsdepositsdialog.o: ../../../src/billsdepositsdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_billsdepositspanel.o: ../../../src/billsdepositspanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetentrydialog.o: ../../../src/budgetentrydialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetingpanel.o: ../../../src/budgetingpanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetyeardialog.o: ../../../src/budgetyeardialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetyearentrydialog.o: ../../../src/budgetyearentrydialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_categdialog.o: ../../../src/categdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_constants.o: ../../../src/constants.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_currencydialog.o: ../../../src/currencydialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_dbwrapper.o: ../../../src/dbwrapper.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_filtertransdialog.o: ../../../src/filtertransdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_general_report_manager.o: ../../../src/general_report_manager.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_images_list.o: ../../../src/images_list.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_maincurrencydialog.o: ../../../src/maincurrencydialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_minimal_editor.o: ../../../src/minimal_editor.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmCalculator.o: ../../../src/mmCalculator.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmOption.o: ../../../src/mmOption.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmcheckingpanel.o: ../../../src/mmcheckingpanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmex.o: ../../../src/mmex.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmframe.o: ../../../src/mmframe.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmhelppanel.o: ../../../src/mmhelppanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmhomepagepanel.o: ../../../src/mmhomepagepanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmreportspanel.o: ../../../src/mmreportspanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_optionsdialog.o: ../../../src/optionsdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_paths.o: ../../../src/paths.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_payeedialog.o: ../../../src/payeedialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_recentfiles.o: ../../../src/recentfiles.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_relocatecategorydialog.o: ../../../src/relocatecategorydialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_relocatepayeedialog.o: ../../../src/relocatepayeedialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_splitdetailsdialog.o: ../../../src/splitdetailsdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_splittransactionsdialog.o: ../../../src/splittransactionsdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_stockdialog.o: ../../../src/stockdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_stockspanel.o: ../../../src/stockspanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_transdialog.o: ../../../src/transdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_util.o: ../../../src/util.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_webapp.o: ../../../src/webapp.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_webserver.o: ../../../src/webserver.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_wizard_newaccount.o: ../../../src/wizard_newaccount.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_wizard_newdb.o: ../../../src/wizard_newdb.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budget.o: ../../../src/reports/budget.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetcategorysummary.o: ../../../src/reports/budgetcategorysummary.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_budgetingperf.o: ../../../src/reports/budgetingperf.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_cashflow.o: ../../../src/reports/cashflow.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_categexp.o: ../../../src/reports/categexp.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_categovertimeperf.o: ../../../src/reports/categovertimeperf.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_chart.o: ../../../src/reports/chart.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_html_widget_bills_and_deposits.o: ../../../src/reports/html_widget_bills_and_deposits.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_html_widget_stocks.o: ../../../src/reports/html_widget_stocks.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_html_widget_top_categories.o: ../../../src/reports/html_widget_top_categories.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_htmlbuilder.o: ../../../src/reports/htmlbuilder.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_incexpenses.o: ../../../src/reports/incexpenses.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmDateRange.o: ../../../src/reports/mmDateRange.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmgraphgenerator.o: ../../../src/reports/mmgraphgenerator.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmgraphincexpensesmonth.o: ../../../src/reports/mmgraphincexpensesmonth.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmgraphpie.o: ../../../src/reports/mmgraphpie.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmgraphtopcategories.o: ../../../src/reports/mmgraphtopcategories.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_payee.o: ../../../src/reports/payee.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_reportbase.o: ../../../src/reports/reportbase.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_transactions.o: ../../../src/reports/transactions.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_platfdep.o: ../../../src/win/platfdep.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_export.o: ../../../src/import_export/export.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_qif_export.o: ../../../src/import_export/qif_export.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_qif_import.o: ../../../src/import_export/qif_import.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_qif_import_gui.o: ../../../src/import_export/qif_import_gui.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_univcsvdialog.o: ../../../src/import_export/univcsvdialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Account.o: ../../../src/model/Model_Account.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Asset.o: ../../../src/model/Model_Asset.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Attachment.o: ../../../src/model/Model_Attachment.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Billsdeposits.o: ../../../src/model/Model_Billsdeposits.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Budget.o: ../../../src/model/Model_Budget.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Budgetsplittransaction.o: ../../../src/model/Model_Budgetsplittransaction.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Budgetyear.o: ../../../src/model/Model_Budgetyear.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Category.o: ../../../src/model/Model_Category.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Checking.o: ../../../src/model/Model_Checking.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Currency.o: ../../../src/model/Model_Currency.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Infotable.o: ../../../src/model/Model_Infotable.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Payee.o: ../../../src/model/Model_Payee.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Report.o: ../../../src/model/Model_Report.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Setting.o: ../../../src/model/Model_Setting.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Splittransaction.o: ../../../src/model/Model_Splittransaction.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Stock.o: ../../../src/model/Model_Stock.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Subcategory.o: ../../../src/model/Model_Subcategory.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_Model_Usage.o: ../../../src/model/Model_Usage.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_html_template.o: ../../../3rd/cgitemplate/html_template.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mongoose.o: ../../../3rd/mongoose/mongoose.c - $(CC) -c -o $@ $(MMEX_TESTS_CFLAGS) $(CPPDEPS) $< - -mmex_tests_csv_parser.o: ../../../3rd/csv-parser/csv_parser.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_cpu_timer.o: ../../../src/tests/cpu_timer.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_db_init_model.o: ../../../src/tests/db_init_model.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_framebase_tests.o: ../../../src/tests/framebase_tests.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmex_tests.o: ../../../src/tests/mmex_tests.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_about_dialog.o: ../../../src/tests/test_about_dialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_assets.o: ../../../src/tests/test_assets.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_billsdeposits.o: ../../../src/tests/test_billsdeposits.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_callback_hooks.o: ../../../src/tests/test_callback_hooks.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_checking.o: ../../../src/tests/test_checking.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_currency.o: ../../../src/tests/test_currency.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_database_initialisation.o: ../../../src/tests/test_database_initialisation.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_date_range.o: ../../../src/tests/test_date_range.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_filtertrans_dialog.o: ../../../src/tests/test_filtertrans_dialog.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_relocate_category.o: ../../../src/tests/test_relocate_category.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_relocate_payee.o: ../../../src/tests/test_relocate_payee.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_test_stocks.o: ../../../src/tests/test_stocks.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - -mmex_tests_mmex_tests_rc.o: ../../../src/tests/mmex_tests.rc - windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_26_p_1) $(__WXUNICODE_DEFINE_p_2) $(__WXDEBUG_DEFINE_p_2) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(__DEBUG_DEFINE_p_4) --include-dir ../../../lib/wxsqlite3/sqlite3/secure/src --include-dir ../../../lib/wxsqlite3/include --include-dir ../../../lib/lua/src --include-dir ../../../lib --include-dir ../../../3rd --include-dir ../../../3rd/LuaGlue/include --include-dir ../../../3rd/cgitemplate --include-dir ../../../3rd/csv-parser/include --include-dir ../../../src --define NOPCH --include-dir ../../../src --include-dir ../../../lib/cppunit/include - .PHONY: all install uninstall clean check Modified: trunk/build/msw/tests/makefile.vc =================================================================== --- trunk/build/msw/tests/makefile.vc 2014-05-15 14:42:25 UTC (rev 6585) +++ trunk/build/msw/tests/makefile.vc 2014-05-15 14:43:08 UTC (rev 6586) @@ -13,197 +13,29 @@ ### Variables: ### COMPILER_PREFIX = vc -WXSQLITE_CFLAGS = /MD$(__DEBUGINFO_1) /DWIN32 /W4 $(__DEBUGINFO) \ - $(____DEBUGINFO) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ - /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ +WXSQLITE_CFLAGS = /MD$(__DEBUGINFO_11) /DWIN32 /W4 $(__DEBUGINFO_8) \ + $(____DEBUGINFO_10_p) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG_14) \ + $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED_15_p) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include /DNOPCH /DSQLITE_CORE /DSQLITE_ENABLE_FTS3 \ /DSQLITE_ENABLE_FTS3_PARENTHESIS /DSQLITE_HAS_CODEC \ /DSQLITE_ENABLE_COLUMN_METADATA /DWXSQLITE3_HAVE_CODEC \ - /DWXSQLITE3_HAVE_METADATA /I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - /I..\..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) -WXSQLITE_CXXFLAGS = /MD$(__DEBUGINFO_1) /DWIN32 /W4 $(__DEBUGINFO) \ - $(____DEBUGINFO) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) \ - /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ - $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /DWXSQLITE3_HAVE_METADATA /I..\..\lib\wxsqlite3\sqlite3\secure\src \ + /I..\..\lib\wxsqlite3\include $(CPPFLAGS) $(CFLAGS) +WXSQLITE_CXXFLAGS = /MD$(__DEBUGINFO_11) /DWIN32 /W4 $(__DEBUGINFO_8) \ + $(____DEBUGINFO_10_p) /Fdwxsqlite.pdb $(__OPTIMIZEFLAG_14) \ + $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS $(____WX_SHARED_15_p) \ + $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ /I$(WX_DIR)\include /DNOPCH /DSQLITE_CORE /DSQLITE_ENABLE_FTS3 \ /DSQLITE_ENABLE_FTS3_PARENTHESIS /DSQLITE_HAS_CODEC \ /DSQLITE_ENABLE_COLUMN_METADATA /DWXSQLITE3_HAVE_CODEC \ - /DWXSQLITE3_HAVE_METADATA /I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - /I..\..\..\lib\wxsqlite3\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + /DWXSQLITE3_HAVE_METADATA /I..\..\lib\wxsqlite3\sqlite3\secure\src \ + /I..\..\lib\wxsqlite3\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXSQLITE_OBJECTS = \ wxsqlite_wxsqlite3.obj \ wxsqlite_sqlite3secure.obj -LUA_CFLAGS = /MD$(__DEBUGINFO_1) /DWIN32 /W4 $(__DEBUGINFO) $(____DEBUGINFO) \ - /Fdlua.pdb $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ - $(CPPFLAGS) $(CFLAGS) -LUA_OBJECTS = \ - lua_lapi.obj \ - lua_lauxlib.obj \ - lua_lbaselib.obj \ - lua_lbitlib.obj \ - lua_lcode.obj \ - lua_lcorolib.obj \ - lua_lctype.obj \ - lua_ldblib.obj \ - lua_ldebug.obj \ - lua_ldo.obj \ - lua_ldump.obj \ - lua_lfunc.obj \ - lua_lgc.obj \ - lua_linit.obj \ - lua_liolib.obj \ - lua_llex.obj \ - lua_lmathlib.obj \ - lua_lmem.obj \ - lua_loadlib.obj \ - lua_lobject.obj \ - lua_lopcodes.obj \ - lua_loslib.obj \ - lua_lparser.obj \ - lua_lstate.obj \ - lua_lstring.obj \ - lua_lstrlib.obj \ - lua_ltable.obj \ - lua_ltablib.obj \ - lua_ltm.obj \ - lua_lua.obj \ - lua_luac.obj \ - lua_lundump.obj \ - lua_lvm.obj \ - lua_lzio.obj -MMEX_TESTS_CFLAGS = /MD$(__DEBUGINFO_1) /DWIN32 $(____WX_SHARED) \ - $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ - /I$(WX_DIR)$(__WXLIBPATH_FILENAMES_1)\msw$(WXLIBPOSTFIX) \ - /I$(WX_DIR)\include /W4 $(__DEBUGINFO) $(____DEBUGINFO) /Fdmmex_tests.pdb \ - $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ - /I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - /I..\..\..\lib\wxsqlite3\include /I..\..\..\lib\lua\src /I..\..\..\lib \ - /I..\..\..\3rd /I..\..\..\3rd\LuaGlue\include /I..\..\..\3rd\cgitemplate \ - /I..\..\..\3rd\csv-parser\include /I..\..\..\src /DNOPCH /D_CONSOLE \ - /I..\..\..\src /I..\..\..\lib\cppunit\include $(CPPFLAGS) $(CFLAGS) -MMEX_TESTS_CXXFLAGS = /MD$(__DEBUGINFO_1) /DWIN32 $(____WX_SHARED) \ - $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ - /I$(WX_DIR)$(__WXLIBPATH_FILENAMES_1)\msw$(WXLIBPOSTFIX) \ - /I$(WX_DIR)\include /W4 $(__DEBUGINFO) $(____DEBUGINFO) /Fdmmex_tests.pdb \ - $(__OPTIMIZEFLAG) $(__DEBUG_DEFINE_p) /D_CRT_SECURE_NO_WARNINGS \ - /I..\..\..\lib\wxsqlite3\sqlite3\secure\src \ - /I..\..\..\lib\wxsqlite3\include /I..\..\..\lib\lua\src /I..\..\..\lib \ - /I..\..\..\3rd /I..\..\..\3rd\LuaGlue\include /I..\..\..\3rd\cgitemplate \ - /I..\..\..\3rd\csv-parser\include /I..\..\..\src /DNOPCH /D_CONSOLE \ - /I..\..\..\src /I..\..\..\lib\cppunit\include /EHsc /GR \ - $(__mmex_tests_CL_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -MMEX_TESTS_OBJECTS = \ - mmex_tests_aboutdialog.obj \ - mmex_tests_accountdialog.obj \ - mmex_tests_appstartdialog.obj \ - mmex_tests_assetdialog.obj \ - mmex_tests_assetspanel.obj \ - mmex_tests_attachmentdialog.obj \ - mmex_tests_billsdepositsdialog.obj \ - mmex_tests_billsdepositspanel.obj \ - mmex_tests_budgetentrydialog.obj \ - mmex_tests_budgetingpanel.obj \ - mmex_tests_budgetyeardialog.obj \ - mmex_tests_budgetyearentrydialog.obj \ - mmex_tests_categdialog.obj \ - mmex_tests_constants.obj \ - mmex_tests_currencydialog.obj \ - mmex_tests_dbwrapper.obj \ - mmex_tests_filtertransdialog.obj \ - mmex_tests_general_report_manager.obj \ - mmex_tests_images_list.obj \ - mmex_tests_maincurrencydialog.obj \ - mmex_tests_minimal_editor.obj \ - mmex_tests_mmCalculator.obj \ - mmex_tests_mmOption.obj \ - mmex_tests_mmcheckingpanel.obj \ - mmex_tests_mmex.obj \ - mmex_tests_mmframe.obj \ - mmex_tests_mmhelppanel.obj \ - mmex_tests_mmhomepagepanel.obj \ - mmex_tests_mmreportspanel.obj \ - mmex_tests_optionsdialog.obj \ - mmex_tests_paths.obj \ - mmex_tests_payeedialog.obj \ - mmex_tests_recentfiles.obj \ - mmex_tests_relocatecategorydialog.obj \ - mmex_tests_relocatepayeedialog.obj \ - mmex_tests_splitdetailsdialog.obj \ - mmex_tests_splittransactionsdialog.obj \ - mmex_tests_stockdialog.obj \ - mmex_tests_stockspanel.obj \ - mmex_tests_transdialog.obj \ - mmex_tests_util.obj \ - mmex_tests_webapp.obj \ - mmex_tests_webserver.obj \ - mmex_tests_wizard_newaccount.obj \ - mmex_tests_wizard_newdb.obj \ - mmex_tests_budget.obj \ - mmex_tests_budgetcategorysummary.obj \ - mmex_tests_budgetingperf.obj \ - mmex_tests_cashflow.obj \ - mmex_tests_categexp.obj \ - mmex_tests_categovertimeperf.obj \ - mmex_tests_chart.obj \ - mmex_tests_html_widget_bills_and_deposits.obj \ - mmex_tests_html_widget_stocks.obj \ - mmex_tests_html_widget_top_categories.obj \ - mmex_tests_htmlbuilder.obj \ - mmex_tests_incexpenses.obj \ - mmex_tests_mmDateRange.obj \ - mmex_tests_mmgraphgenerator.obj \ - mmex_tests_mmgraphincexpensesmonth.obj \ - mmex_tests_mmgraphpie.obj \ - mmex_tests_mmgraphtopcategories.obj \ - mmex_tests_payee.obj \ - mmex_tests_reportbase.obj \ - mmex_tests_transactions.obj \ - mmex_tests_platfdep.obj \ - mmex_tests_export.obj \ - mmex_tests_qif_export.obj \ - mmex_tests_qif_import.obj \ - mmex_tests_qif_import_gui.obj \ - mmex_tests_univcsvdialog.obj \ - mmex_tests_Model_Account.obj \ - mmex_tests_Model_Asset.obj \ - mmex_tests_Model_Attachment.obj \ - mmex_tests_Model_Billsdeposits.obj \ - mmex_tests_Model_Budget.obj \ - mmex_tests_Model_Budgetsplittransaction.obj \ - mmex_tests_Model_Budgetyear.obj \ - mmex_tests_Model_Category.obj \ - mmex_tests_Model_Checking.obj \ - mmex_tests_Model_Currency.obj \ - mmex_tests_Model_Infotable.obj \ - mmex_tests_Model_Payee.obj \ - mmex_tests_Model_Report.obj \ - mmex_tests_Model_Setting.obj \ - mmex_tests_Model_Splittransaction.obj \ - mmex_tests_Model_Stock.obj \ - mmex_tests_Model_Subcategory.obj \ - mmex_tests_Model_Usage.obj \ - mmex_tests_html_template.obj \ - mmex_tests_mongoose.obj \ - mmex_tests_csv_parser.obj \ - mmex_tests_cpu_timer.obj \ - mmex_tests_db_init_model.obj \ - mmex_tests_framebase_tests.obj \ - mmex_tests_mmex_tests.obj \ - mmex_tests_test_about_dialog.obj \ - mmex_tests_test_assets.obj \ - mmex_tests_test_billsdeposits.obj \ - mmex_tests_test_callback_hooks.obj \ - mmex_tests_test_checking.obj \ - mmex_tests_test_currency.obj \ - mmex_tests_test_database_initialisation.obj \ - mmex_tests_test_date_range.obj \ - mmex_tests_test_filtertrans_dialog.obj \ - mmex_tests_test_relocate_category.obj \ - mmex_tests_test_relocate_payee.obj \ - mmex_tests_test_stocks.obj MMEX_TESTS_RESOURCES = \ mmex_tests_mmex_tests.res @@ -224,42 +56,78 @@ !if "$(WX_SHARED)" == "1" WXLIBPATH = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif -!if "$(WX_SHARED)" == "0" -__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_8 = !endif -!if "$(WX_SHARED)" == "1" -__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_8 = /Zi !endif +!if "$(WX_DEBUG)" == "0" +____DEBUGINFO_10_p = +!endif +!if "$(WX_DEBUG)" == "1" +____DEBUGINFO_10_p = /D_DEBUG +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUGINFO_11 = +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUGINFO_11 = d +!endif +!if "$(WX_DEBUG)" == "0" +__OPTIMIZEFLAG_14 = /O2 +!endif +!if "$(WX_DEBUG)" == "1" +__OPTIMIZEFLAG_14 = /Od +!endif +!if "$(WX_DEBUG)" == "0" +__DEBUG_DEFINE_p = /DNDEBUG +!endif +!if "$(WX_DEBUG)" == "1" +__DEBUG_DEFINE_p = /D_DEBUG +!endif !if "$(WX_SHARED)" == "0" -____WX_SHARED_46_p_1 = +____WX_SHARED_15_p = !endif !if "$(WX_SHARED)" == "1" -____WX_SHARED_46_p_1 = /d WXUSINGDLL +____WX_SHARED_15_p = /DWXUSINGDLL !endif !if "$(WX_UNICODE)" == "1" -__WXUNICODE_DEFINE_p_2 = /d _UNICODE +__WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_DEBUG)" == "1" -__WXDEBUG_DEFINE_p_2 = /d __WXDEBUG__ +__WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" -__WXLIBPATH_FILENAMES_1 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib !endif !if "$(WX_SHARED)" == "1" -__WXLIBPATH_FILENAMES_1 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +__WXLIBPATH_FILENAMES = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif !if "$(WX_SHARED)" == "0" -__WXLIBPATH_FILENAMES_2 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +____WX_SHARED_47_p_1 = !endif !if "$(WX_SHARED)" == "1" -__WXLIBPATH_FILENAMES_2 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +____WX_SHARED_47_p_1 = /d WXUSINGDLL !endif +!if "$(WX_UNICODE)" == "1" +__WXUNICODE_DEFINE_p_3 = /d _UNICODE +!endif +!if "$(WX_DEBUG)" == "1" +__WXDEBUG_DEFINE_p_3 = /d __WXDEBUG__ +!endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib !endif !if "$(WX_SHARED)" == "1" __WXLIBPATH_FILENAMES_3 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll !endif +!if "$(WX_SHARED)" == "0" +__WXLIBPATH_FILENAMES_4 = \lib\$(COMPILER_PREFIX)$(WXCPU)_lib +!endif +!if "$(WX_SHARED)" == "1" +__WXLIBPATH_FILENAMES_4 = \lib\$(COMPILER_PREFIX)$(WXCPU)_dll +!endif !if "$(TARGET_CPU)" == "AMD64" ____mmex_tests_CPU_SUF_FILENAMES = _amd64 !endif @@ -273,28 +141,28 @@ ____mmex_tests_LIB_SUF_FILENAMES = _dll !endif !if "$(WX_DEBUG)" == "0" -__DEBUGINFO_54 = +__DEBUGINFO_55 = !endif !if "$(WX_DEBUG)" == "1" -__DEBUGINFO_54 = /DEBUG +__DEBUGINFO_55 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" -____DEBUGINFO_55_p_1 = +____DEBUGINFO_56_p_1 = !endif !if "$(WX_DEBUG)" == "1" -____DEBUGINFO_55_p_1 = /d _DEBUG +____DEBUGINFO_56_p_1 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" -__DEBUGINFO_57 = /opt:ref /opt:icf +__DEBUGINFO_58 = /opt:ref /opt:icf !endif !if "$(WX_DEBUG)" == "1" -__DEBUGINFO_57 = +__DEBUGINFO_58 = !endif !if "$(WX_DEBUG)" == "0" -__DEBUGINFO_58 = +__DEBUGINFO_59 = !endif !if "$(WX_DEBUG)" == "1" -__DEBUGINFO_58 = $(__DEBUGINFO_57) +__DEBUGINFO_59 = $(__DEBUGINFO_58) !endif !if "$(WX_DEBUG)" == "0" __DEBUG_DEFINE_p_4 = /d NDEBUG @@ -303,9 +171,6 @@ __DEBUG_DEFINE_p_4 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" -__mmex_tests_CL_FLAGS = /Zi -!endif -!if "$(WX_DEBUG)" == "0" __mmex_tests_LINK_FLAGS = /DEBUG /MAP /MAPINFO:EXPORTS /OPT:REF /OPT:ICF !endif !if "$(WX_MONOLITHIC)" == "0" @@ -341,48 +206,6 @@ !if "$(WX_MONOLITHIC)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)$(WXLIBPOSTFIX).lib !endif -!if "$(WX_SHARED)" == "0" -____WX_SHARED = -!endif -!if "$(WX_SHARED)" == "1" -____WX_SHARED = /DWXUSINGDLL -!endif -!if "$(WX_UNICODE)" == "1" -__WXUNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(WX_DEBUG)" == "1" -__WXDEBUG_DEFINE_p = /D__WXDEBUG__ -!endif -!if "$(WX_DEBUG)" == "0" -__DEBUGINFO = -!endif -!if "$(WX_DEBUG)" == "1" -__DEBUGINFO = /Zi -!endif -!if "$(WX_DEBUG)" == "0" -____DEBUGINFO = -!endif -!if "$(WX_DEBUG)" == "1" -____DEBUGINFO = /D_DEBUG -!endif -!if "$(WX_DEBUG)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(WX_DEBUG)" == "1" -__DEBUGINFO_1 = d -!endif -!if "$(WX_DEBUG)" == "0" -__OPTIMIZEFLAG = /O2 -!endif -!if "$(WX_DEBUG)" == "1" -__OPTIMIZEFLAG = /Od -!endif -!if "$(WX_DEBUG)" == "0" -__DEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(WX_DEBUG)" == "1" -__DEBUG_DEFINE_p = /D_DEBUG -!endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif @@ -437,10 +260,10 @@ $(WXSQLITE_OBJECTS) << -lua.lib: $(LUA_OBJECTS) +lua.lib: if exist $@ del $@ link /LIB /NOLOGO /OUT:$@ @<< - $(LUA_OBJECTS) + << cppunit.lib: @@ -449,447 +272,21 @@ << -mmex_tests.exe: $(MMEX_TESTS_OBJECTS) wxsqlite.lib lua.lib cppunit.lib mmex_tests_mmex_tests.res - link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_3) $(WXMACHINE_FLAG) /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) $(__DEBUGINFO_54) /pdb:"mmex_tests.pdb" $(__DEBUGINFO_58) /SAFESEH:NO $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(MMEX_TESTS_OBJECTS) $(MMEX_TESTS_RESOURCES) wxsqlite.lib lua.lib $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib cppunit.lib +mmex_tests.exe: wxsqlite.lib lua.lib cppunit.lib mmex_tests_mmex_tests.res + link /NOLOGO /OUT:$@ /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES_4) $(WXMACHINE_FLAG) /LIBPATH:$(WX_DIR)\lib\vc$(____mmex_tests_CPU_SUF_FILENAMES)$(____mmex_tests_LIB_SUF_FILENAMES) $(__DEBUGINFO_55) /pdb:"mmex_tests.pdb" $(__DEBUGINFO_59) /SAFESEH:NO $(__mmex_tests_LINK_FLAGS) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(MMEX_TESTS_RESOURCES) wxsqlite.lib lua.lib $(__WXLIB_CORE_NAME_p) $(__WXLIB_QA_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_AUI_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_STC_NAME_p) wxscintilla$(WX3RDPARTYLIBPOSTFIX).lib $(__WXLIB_WEBVIEW_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib cppunit.lib << mt.exe -manifest ".\mmex_tests.exe.manifest" -outputresource:".\mmex_tests.exe";1 check: all .\mmex_tests.exe -wxsqlite_wxsqlite3.obj: ..\..\..\lib\wxsqlite3\src\wxsqlite3.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXSQLITE_CXXFLAGS) ..\..\..\lib\wxsqlite3\src\wxsqlite3.cpp +wxsqlite_wxsqlite3.obj: ..\..\lib\wxsqlite3\src\wxsqlite3.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXSQLITE_CXXFLAGS) ..\..\lib\wxsqlite3\src\wxsqlite3.cpp -wxsqlite_sqlite3secure.obj: ..\..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c - $(CC) /c /nologo /TC /Fo$@ $(WXSQLITE_CFLAGS) ..\..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c +wxsqlite_sqlite3secure.obj: ..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c + $(CC) /c /nologo /TC /Fo$@ $(WXSQLITE_CFLAGS) ..\..\lib\wxsqlite3\sqlite3\secure\src\sqlite3secure.c -lua_lapi.obj: ..\..\..\lib\lua\src\lapi.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lapi.c +mmex_tests_mmex_tests.res: ..\..\tests\mmex_tests.rc + rc /fo$@ /d WIN32 $(____WX_SHARED_47_p_1) $(__WXUNICODE_DEFINE_p_3) $(__WXDEBUG_DEFINE_p_3) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES_3)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____DEBUGINFO_56_p_1) $(__DEBUG_DEFINE_p_4) /i ..\..\lib\wxsqlite3\sqlite3\secure\src /i ..\..\lib\wxsqlite3\include /i ..\..\lib\lua\src /i ..\..\lib /i ..\..\3rd /i ..\..\3rd\LuaGlue\include /i ..\..\3rd\cgitemplate /i ..\..\3rd\csv-parser\include /i ..\..\src /d NOPCH /d _CONSOLE /i ..\..\src /i ..\..\lib\cppunit\include ..\..\tests\mmex_tests.rc -lua_lauxlib.obj: ..\..\..\lib\lua\src\lauxlib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lauxlib.c - -lua_lbaselib.obj: ..\..\..\lib\lua\src\lbaselib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lbaselib.c - -lua_lbitlib.obj: ..\..\..\lib\lua\src\lbitlib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lbitlib.c - -lua_lcode.obj: ..\..\..\lib\lua\src\lcode.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lcode.c - -lua_lcorolib.obj: ..\..\..\lib\lua\src\lcorolib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lcorolib.c - -lua_lctype.obj: ..\..\..\lib\lua\src\lctype.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lctype.c - -lua_ldblib.obj: ..\..\..\lib\lua\src\ldblib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ldblib.c - -lua_ldebug.obj: ..\..\..\lib\lua\src\ldebug.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ldebug.c - -lua_ldo.obj: ..\..\..\lib\lua\src\ldo.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ldo.c - -lua_ldump.obj: ..\..\..\lib\lua\src\ldump.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ldump.c - -lua_lfunc.obj: ..\..\..\lib\lua\src\lfunc.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lfunc.c - -lua_lgc.obj: ..\..\..\lib\lua\src\lgc.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lgc.c - -lua_linit.obj: ..\..\..\lib\lua\src\linit.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\linit.c - -lua_liolib.obj: ..\..\..\lib\lua\src\liolib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\liolib.c - -lua_llex.obj: ..\..\..\lib\lua\src\llex.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\llex.c - -lua_lmathlib.obj: ..\..\..\lib\lua\src\lmathlib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lmathlib.c - -lua_lmem.obj: ..\..\..\lib\lua\src\lmem.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lmem.c - -lua_loadlib.obj: ..\..\..\lib\lua\src\loadlib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\loadlib.c - -lua_lobject.obj: ..\..\..\lib\lua\src\lobject.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lobject.c - -lua_lopcodes.obj: ..\..\..\lib\lua\src\lopcodes.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lopcodes.c - -lua_loslib.obj: ..\..\..\lib\lua\src\loslib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\loslib.c - -lua_lparser.obj: ..\..\..\lib\lua\src\lparser.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lparser.c - -lua_lstate.obj: ..\..\..\lib\lua\src\lstate.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lstate.c - -lua_lstring.obj: ..\..\..\lib\lua\src\lstring.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lstring.c - -lua_lstrlib.obj: ..\..\..\lib\lua\src\lstrlib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lstrlib.c - -lua_ltable.obj: ..\..\..\lib\lua\src\ltable.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ltable.c - -lua_ltablib.obj: ..\..\..\lib\lua\src\ltablib.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ltablib.c - -lua_ltm.obj: ..\..\..\lib\lua\src\ltm.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\ltm.c - -lua_lua.obj: ..\..\..\lib\lua\src\lua.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lua.c - -lua_luac.obj: ..\..\..\lib\lua\src\luac.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\luac.c - -lua_lundump.obj: ..\..\..\lib\lua\src\lundump.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lundump.c - -lua_lvm.obj: ..\..\..\lib\lua\src\lvm.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lvm.c - -lua_lzio.obj: ..\..\..\lib\lua\src\lzio.c - $(CC) /c /nologo /TC /Fo$@ $(LUA_CFLAGS) ..\..\..\lib\lua\src\lzio.c - -mmex_tests_aboutdialog.obj: ..\..\..\src\aboutdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\aboutdialog.cpp - -mmex_tests_accountdialog.obj: ..\..\..\src\accountdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\accountdialog.cpp - -mmex_tests_appstartdialog.obj: ..\..\..\src\appstartdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\appstartdialog.cpp - -mmex_tests_assetdialog.obj: ..\..\..\src\assetdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\assetdialog.cpp - -mmex_tests_assetspanel.obj: ..\..\..\src\assetspanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\assetspanel.cpp - -mmex_tests_attachmentdialog.obj: ..\..\..\src\attachmentdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\attachmentdialog.cpp - -mmex_tests_billsdepositsdialog.obj: ..\..\..\src\billsdepositsdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\billsdepositsdialog.cpp - -mmex_tests_billsdepositspanel.obj: ..\..\..\src\billsdepositspanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\billsdepositspanel.cpp - -mmex_tests_budgetentrydialog.obj: ..\..\..\src\budgetentrydialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\budgetentrydialog.cpp - -mmex_tests_budgetingpanel.obj: ..\..\..\src\budgetingpanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\budgetingpanel.cpp - -mmex_tests_budgetyeardialog.obj: ..\..\..\src\budgetyeardialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\budgetyeardialog.cpp - -mmex_tests_budgetyearentrydialog.obj: ..\..\..\src\budgetyearentrydialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\budgetyearentrydialog.cpp - -mmex_tests_categdialog.obj: ..\..\..\src\categdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\categdialog.cpp - -mmex_tests_constants.obj: ..\..\..\src\constants.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\constants.cpp - -mmex_tests_currencydialog.obj: ..\..\..\src\currencydialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\currencydialog.cpp - -mmex_tests_dbwrapper.obj: ..\..\..\src\dbwrapper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\dbwrapper.cpp - -mmex_tests_filtertransdialog.obj: ..\..\..\src\filtertransdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\filtertransdialog.cpp - -mmex_tests_general_report_manager.obj: ..\..\..\src\general_report_manager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\general_report_manager.cpp - -mmex_tests_images_list.obj: ..\..\..\src\images_list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\images_list.cpp - -mmex_tests_maincurrencydialog.obj: ..\..\..\src\maincurrencydialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\maincurrencydialog.cpp - -mmex_tests_minimal_editor.obj: ..\..\..\src\minimal_editor.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\minimal_editor.cpp - -mmex_tests_mmCalculator.obj: ..\..\..\src\mmCalculator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmCalculator.cpp - -mmex_tests_mmOption.obj: ..\..\..\src\mmOption.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmOption.cpp - -mmex_tests_mmcheckingpanel.obj: ..\..\..\src\mmcheckingpanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmcheckingpanel.cpp - -mmex_tests_mmex.obj: ..\..\..\src\mmex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmex.cpp - -mmex_tests_mmframe.obj: ..\..\..\src\mmframe.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmframe.cpp - -mmex_tests_mmhelppanel.obj: ..\..\..\src\mmhelppanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmhelppanel.cpp - -mmex_tests_mmhomepagepanel.obj: ..\..\..\src\mmhomepagepanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmhomepagepanel.cpp - -mmex_tests_mmreportspanel.obj: ..\..\..\src\mmreportspanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmreportspanel.cpp - -mmex_tests_optionsdialog.obj: ..\..\..\src\optionsdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\optionsdialog.cpp - -mmex_tests_paths.obj: ..\..\..\src\paths.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\paths.cpp - -mmex_tests_payeedialog.obj: ..\..\..\src\payeedialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\payeedialog.cpp - -mmex_tests_recentfiles.obj: ..\..\..\src\recentfiles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\recentfiles.cpp - -mmex_tests_relocatecategorydialog.obj: ..\..\..\src\relocatecategorydialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\relocatecategorydialog.cpp - -mmex_tests_relocatepayeedialog.obj: ..\..\..\src\relocatepayeedialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\relocatepayeedialog.cpp - -mmex_tests_splitdetailsdialog.obj: ..\..\..\src\splitdetailsdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\splitdetailsdialog.cpp - -mmex_tests_splittransactionsdialog.obj: ..\..\..\src\splittransactionsdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\splittransactionsdialog.cpp - -mmex_tests_stockdialog.obj: ..\..\..\src\stockdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\stockdialog.cpp - -mmex_tests_stockspanel.obj: ..\..\..\src\stockspanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\stockspanel.cpp - -mmex_tests_transdialog.obj: ..\..\..\src\transdialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\transdialog.cpp - -mmex_tests_util.obj: ..\..\..\src\util.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\util.cpp - -mmex_tests_webapp.obj: ..\..\..\src\webapp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\webapp.cpp - -mmex_tests_webserver.obj: ..\..\..\src\webserver.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS... [truncated message content] |
From: <gua...@us...> - 2014-05-15 14:42:30
|
Revision: 6585 http://sourceforge.net/p/moneymanagerex/code/6585 Author: guanlisheng Date: 2014-05-15 14:42:25 +0000 (Thu, 15 May 2014) Log Message: ----------- re order the source folder Modified Paths: -------------- trunk/tests/Makefile.in Added Paths: ----------- trunk/tests/ Modified: trunk/tests/Makefile.in =================================================================== --- trunk/src/tests/Makefile.in 2014-05-15 11:31:48 UTC (rev 6584) +++ trunk/tests/Makefile.in 2014-05-15 14:42:25 UTC (rev 6585) @@ -39,17 +39,15 @@ WXSQLITE_CFLAGS = -DNOPCH -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_HAS_CODEC \ -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ - -DWXSQLITE3_HAVE_METADATA \ - -I$(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src \ - -I$(srcdir)/../../lib/wxsqlite3/include $(PIC_FLAG) $(WX_CFLAGS) \ - $(CPPFLAGS) $(CFLAGS) + -DWXSQLITE3_HAVE_METADATA -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ + -I$(srcdir)/../lib/wxsqlite3/include $(PIC_FLAG) $(WX_CFLAGS) $(CPPFLAGS) \ + $(CFLAGS) WXSQLITE_CXXFLAGS = -DNOPCH -DSQLITE_CORE -DSQLITE_ENABLE_FTS3 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_HAS_CODEC \ -DSQLITE_ENABLE_COLUMN_METADATA -DWXSQLITE3_HAVE_CODEC \ - -DWXSQLITE3_HAVE_METADATA \ - -I$(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src \ - -I$(srcdir)/../../lib/wxsqlite3/include $(PIC_FLAG) $(WX_CXXFLAGS) \ - $(CPPFLAGS) $(CXXFLAGS) + -DWXSQLITE3_HAVE_METADATA -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ + -I$(srcdir)/../lib/wxsqlite3/include $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) \ + $(CXXFLAGS) WXSQLITE_OBJECTS = \ wxsqlite_wxsqlite3.o \ wxsqlite_sqlite3secure.o @@ -89,20 +87,20 @@ lua_lundump.o \ lua_lvm.o \ lua_lzio.o -MMEX_TESTS_CFLAGS = -I$(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src \ - -I$(srcdir)/../../lib/wxsqlite3/include -I$(srcdir)/../../lib/lua/src \ - -I$(srcdir)/../../lib -I$(srcdir)/../../3rd \ - -I$(srcdir)/../../3rd/LuaGlue/include -I$(srcdir)/../../3rd/cgitemplate \ - -I$(srcdir)/../../3rd/csv-parser/include -I$(srcdir)/../../src -DNOPCH \ - -I$(srcdir)/../../src -I$(srcdir)/../../lib/cppunit/include $(WX_CFLAGS) \ - $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS) -MMEX_TESTS_CXXFLAGS = -I$(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src \ - -I$(srcdir)/../../lib/wxsqlite3/include -I$(srcdir)/../../lib/lua/src \ - -I$(srcdir)/../../lib -I$(srcdir)/../../3rd \ - -I$(srcdir)/../../3rd/LuaGlue/include -I$(srcdir)/../../3rd/cgitemplate \ - -I$(srcdir)/../../3rd/csv-parser/include -I$(srcdir)/../../src -DNOPCH \ - -I$(srcdir)/../../src -I$(srcdir)/../../lib/cppunit/include $(WX_CXXFLAGS) \ - $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) +MMEX_TESTS_CFLAGS = -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ + -I$(srcdir)/../lib/wxsqlite3/include -I$(srcdir)/../lib/lua/src \ + -I$(srcdir)/../lib -I$(srcdir)/../3rd -I$(srcdir)/../3rd/LuaGlue/include \ + -I$(srcdir)/../3rd/cgitemplate -I$(srcdir)/../3rd/csv-parser/include \ + -I$(srcdir)/../src -DNOPCH -I$(srcdir)/../src \ + -I$(srcdir)/../lib/cppunit/include $(WX_CFLAGS) $(PIC_FLAG) $(CPPFLAGS) \ + $(CFLAGS) +MMEX_TESTS_CXXFLAGS = -I$(srcdir)/../lib/wxsqlite3/sqlite3/secure/src \ + -I$(srcdir)/../lib/wxsqlite3/include -I$(srcdir)/../lib/lua/src \ + -I$(srcdir)/../lib -I$(srcdir)/../3rd -I$(srcdir)/../3rd/LuaGlue/include \ + -I$(srcdir)/../3rd/cgitemplate -I$(srcdir)/../3rd/csv-parser/include \ + -I$(srcdir)/../src -DNOPCH -I$(srcdir)/../src \ + -I$(srcdir)/../lib/cppunit/include $(WX_CXXFLAGS) $(PIC_FLAG) $(CPPFLAGS) \ + $(CXXFLAGS) MMEX_TESTS_OBJECTS = \ mmex_tests_aboutdialog.o \ mmex_tests_accountdialog.o \ @@ -269,440 +267,440 @@ check: all ./mmex_tests -wxsqlite_wxsqlite3.o: $(srcdir)/../../lib/wxsqlite3/src/wxsqlite3.cpp - $(CXXC) -c -o $@ $(WXSQLITE_CXXFLAGS) $(srcdir)/../../lib/wxsqlite3/src/wxsqlite3.cpp +wxsqlite_wxsqlite3.o: $(srcdir)/../lib/wxsqlite3/src/wxsqlite3.cpp + $(CXXC) -c -o $@ $(WXSQLITE_CXXFLAGS) $(srcdir)/../lib/wxsqlite3/src/wxsqlite3.cpp -wxsqlite_sqlite3secure.o: $(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c - $(CCC) -c -o $@ $(WXSQLITE_CFLAGS) $(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c +wxsqlite_sqlite3secure.o: $(srcdir)/../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c + $(CCC) -c -o $@ $(WXSQLITE_CFLAGS) $(srcdir)/../lib/wxsqlite3/sqlite3/secure/src/sqlite3secure.c -lua_lapi.o: $(srcdir)/../../lib/lua/src/lapi.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lapi.c +lua_lapi.o: $(srcdir)/../lib/lua/src/lapi.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lapi.c -lua_lauxlib.o: $(srcdir)/../../lib/lua/src/lauxlib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lauxlib.c +lua_lauxlib.o: $(srcdir)/../lib/lua/src/lauxlib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lauxlib.c -lua_lbaselib.o: $(srcdir)/../../lib/lua/src/lbaselib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lbaselib.c +lua_lbaselib.o: $(srcdir)/../lib/lua/src/lbaselib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lbaselib.c -lua_lbitlib.o: $(srcdir)/../../lib/lua/src/lbitlib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lbitlib.c +lua_lbitlib.o: $(srcdir)/../lib/lua/src/lbitlib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lbitlib.c -lua_lcode.o: $(srcdir)/../../lib/lua/src/lcode.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lcode.c +lua_lcode.o: $(srcdir)/../lib/lua/src/lcode.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lcode.c -lua_lcorolib.o: $(srcdir)/../../lib/lua/src/lcorolib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lcorolib.c +lua_lcorolib.o: $(srcdir)/../lib/lua/src/lcorolib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lcorolib.c -lua_lctype.o: $(srcdir)/../../lib/lua/src/lctype.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lctype.c +lua_lctype.o: $(srcdir)/../lib/lua/src/lctype.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lctype.c -lua_ldblib.o: $(srcdir)/../../lib/lua/src/ldblib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ldblib.c +lua_ldblib.o: $(srcdir)/../lib/lua/src/ldblib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ldblib.c -lua_ldebug.o: $(srcdir)/../../lib/lua/src/ldebug.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ldebug.c +lua_ldebug.o: $(srcdir)/../lib/lua/src/ldebug.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ldebug.c -lua_ldo.o: $(srcdir)/../../lib/lua/src/ldo.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ldo.c +lua_ldo.o: $(srcdir)/../lib/lua/src/ldo.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ldo.c -lua_ldump.o: $(srcdir)/../../lib/lua/src/ldump.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ldump.c +lua_ldump.o: $(srcdir)/../lib/lua/src/ldump.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ldump.c -lua_lfunc.o: $(srcdir)/../../lib/lua/src/lfunc.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lfunc.c +lua_lfunc.o: $(srcdir)/../lib/lua/src/lfunc.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lfunc.c -lua_lgc.o: $(srcdir)/../../lib/lua/src/lgc.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lgc.c +lua_lgc.o: $(srcdir)/../lib/lua/src/lgc.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lgc.c -lua_linit.o: $(srcdir)/../../lib/lua/src/linit.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/linit.c +lua_linit.o: $(srcdir)/../lib/lua/src/linit.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/linit.c -lua_liolib.o: $(srcdir)/../../lib/lua/src/liolib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/liolib.c +lua_liolib.o: $(srcdir)/../lib/lua/src/liolib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/liolib.c -lua_llex.o: $(srcdir)/../../lib/lua/src/llex.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/llex.c +lua_llex.o: $(srcdir)/../lib/lua/src/llex.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/llex.c -lua_lmathlib.o: $(srcdir)/../../lib/lua/src/lmathlib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lmathlib.c +lua_lmathlib.o: $(srcdir)/../lib/lua/src/lmathlib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lmathlib.c -lua_lmem.o: $(srcdir)/../../lib/lua/src/lmem.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lmem.c +lua_lmem.o: $(srcdir)/../lib/lua/src/lmem.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lmem.c -lua_loadlib.o: $(srcdir)/../../lib/lua/src/loadlib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/loadlib.c +lua_loadlib.o: $(srcdir)/../lib/lua/src/loadlib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/loadlib.c -lua_lobject.o: $(srcdir)/../../lib/lua/src/lobject.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lobject.c +lua_lobject.o: $(srcdir)/../lib/lua/src/lobject.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lobject.c -lua_lopcodes.o: $(srcdir)/../../lib/lua/src/lopcodes.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lopcodes.c +lua_lopcodes.o: $(srcdir)/../lib/lua/src/lopcodes.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lopcodes.c -lua_loslib.o: $(srcdir)/../../lib/lua/src/loslib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/loslib.c +lua_loslib.o: $(srcdir)/../lib/lua/src/loslib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/loslib.c -lua_lparser.o: $(srcdir)/../../lib/lua/src/lparser.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lparser.c +lua_lparser.o: $(srcdir)/../lib/lua/src/lparser.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lparser.c -lua_lstate.o: $(srcdir)/../../lib/lua/src/lstate.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lstate.c +lua_lstate.o: $(srcdir)/../lib/lua/src/lstate.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lstate.c -lua_lstring.o: $(srcdir)/../../lib/lua/src/lstring.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lstring.c +lua_lstring.o: $(srcdir)/../lib/lua/src/lstring.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lstring.c -lua_lstrlib.o: $(srcdir)/../../lib/lua/src/lstrlib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lstrlib.c +lua_lstrlib.o: $(srcdir)/../lib/lua/src/lstrlib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lstrlib.c -lua_ltable.o: $(srcdir)/../../lib/lua/src/ltable.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ltable.c +lua_ltable.o: $(srcdir)/../lib/lua/src/ltable.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ltable.c -lua_ltablib.o: $(srcdir)/../../lib/lua/src/ltablib.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ltablib.c +lua_ltablib.o: $(srcdir)/../lib/lua/src/ltablib.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ltablib.c -lua_ltm.o: $(srcdir)/../../lib/lua/src/ltm.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/ltm.c +lua_ltm.o: $(srcdir)/../lib/lua/src/ltm.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/ltm.c -lua_lua.o: $(srcdir)/../../lib/lua/src/lua.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lua.c +lua_lua.o: $(srcdir)/../lib/lua/src/lua.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lua.c -lua_luac.o: $(srcdir)/../../lib/lua/src/luac.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/luac.c +lua_luac.o: $(srcdir)/../lib/lua/src/luac.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/luac.c -lua_lundump.o: $(srcdir)/../../lib/lua/src/lundump.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lundump.c +lua_lundump.o: $(srcdir)/../lib/lua/src/lundump.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lundump.c -lua_lvm.o: $(srcdir)/../../lib/lua/src/lvm.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lvm.c +lua_lvm.o: $(srcdir)/../lib/lua/src/lvm.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lvm.c -lua_lzio.o: $(srcdir)/../../lib/lua/src/lzio.c - $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../../lib/lua/src/lzio.c +lua_lzio.o: $(srcdir)/../lib/lua/src/lzio.c + $(CCC) -c -o $@ $(LUA_CFLAGS) $(srcdir)/../lib/lua/src/lzio.c -mmex_tests_aboutdialog.o: $(srcdir)/../../src/aboutdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/aboutdialog.cpp +mmex_tests_aboutdialog.o: $(srcdir)/../src/aboutdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/aboutdialog.cpp -mmex_tests_accountdialog.o: $(srcdir)/../../src/accountdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/accountdialog.cpp +mmex_tests_accountdialog.o: $(srcdir)/../src/accountdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/accountdialog.cpp -mmex_tests_appstartdialog.o: $(srcdir)/../../src/appstartdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/appstartdialog.cpp +mmex_tests_appstartdialog.o: $(srcdir)/../src/appstartdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/appstartdialog.cpp -mmex_tests_assetdialog.o: $(srcdir)/../../src/assetdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/assetdialog.cpp +mmex_tests_assetdialog.o: $(srcdir)/../src/assetdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/assetdialog.cpp -mmex_tests_assetspanel.o: $(srcdir)/../../src/assetspanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/assetspanel.cpp +mmex_tests_assetspanel.o: $(srcdir)/../src/assetspanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/assetspanel.cpp -mmex_tests_attachmentdialog.o: $(srcdir)/../../src/attachmentdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/attachmentdialog.cpp +mmex_tests_attachmentdialog.o: $(srcdir)/../src/attachmentdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/attachmentdialog.cpp -mmex_tests_billsdepositsdialog.o: $(srcdir)/../../src/billsdepositsdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/billsdepositsdialog.cpp +mmex_tests_billsdepositsdialog.o: $(srcdir)/../src/billsdepositsdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/billsdepositsdialog.cpp -mmex_tests_billsdepositspanel.o: $(srcdir)/../../src/billsdepositspanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/billsdepositspanel.cpp +mmex_tests_billsdepositspanel.o: $(srcdir)/../src/billsdepositspanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/billsdepositspanel.cpp -mmex_tests_budgetentrydialog.o: $(srcdir)/../../src/budgetentrydialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/budgetentrydialog.cpp +mmex_tests_budgetentrydialog.o: $(srcdir)/../src/budgetentrydialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/budgetentrydialog.cpp -mmex_tests_budgetingpanel.o: $(srcdir)/../../src/budgetingpanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/budgetingpanel.cpp +mmex_tests_budgetingpanel.o: $(srcdir)/../src/budgetingpanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/budgetingpanel.cpp -mmex_tests_budgetyeardialog.o: $(srcdir)/../../src/budgetyeardialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/budgetyeardialog.cpp +mmex_tests_budgetyeardialog.o: $(srcdir)/../src/budgetyeardialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/budgetyeardialog.cpp -mmex_tests_budgetyearentrydialog.o: $(srcdir)/../../src/budgetyearentrydialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/budgetyearentrydialog.cpp +mmex_tests_budgetyearentrydialog.o: $(srcdir)/../src/budgetyearentrydialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/budgetyearentrydialog.cpp -mmex_tests_categdialog.o: $(srcdir)/../../src/categdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/categdialog.cpp +mmex_tests_categdialog.o: $(srcdir)/../src/categdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/categdialog.cpp -mmex_tests_constants.o: $(srcdir)/../../src/constants.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/constants.cpp +mmex_tests_constants.o: $(srcdir)/../src/constants.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/constants.cpp -mmex_tests_currencydialog.o: $(srcdir)/../../src/currencydialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/currencydialog.cpp +mmex_tests_currencydialog.o: $(srcdir)/../src/currencydialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/currencydialog.cpp -mmex_tests_dbwrapper.o: $(srcdir)/../../src/dbwrapper.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/dbwrapper.cpp +mmex_tests_dbwrapper.o: $(srcdir)/../src/dbwrapper.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/dbwrapper.cpp -mmex_tests_filtertransdialog.o: $(srcdir)/../../src/filtertransdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/filtertransdialog.cpp +mmex_tests_filtertransdialog.o: $(srcdir)/../src/filtertransdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/filtertransdialog.cpp -mmex_tests_general_report_manager.o: $(srcdir)/../../src/general_report_manager.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/general_report_manager.cpp +mmex_tests_general_report_manager.o: $(srcdir)/../src/general_report_manager.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/general_report_manager.cpp -mmex_tests_images_list.o: $(srcdir)/../../src/images_list.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/images_list.cpp +mmex_tests_images_list.o: $(srcdir)/../src/images_list.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/images_list.cpp -mmex_tests_maincurrencydialog.o: $(srcdir)/../../src/maincurrencydialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/maincurrencydialog.cpp +mmex_tests_maincurrencydialog.o: $(srcdir)/../src/maincurrencydialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/maincurrencydialog.cpp -mmex_tests_minimal_editor.o: $(srcdir)/../../src/minimal_editor.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/minimal_editor.cpp +mmex_tests_minimal_editor.o: $(srcdir)/../src/minimal_editor.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/minimal_editor.cpp -mmex_tests_mmCalculator.o: $(srcdir)/../../src/mmCalculator.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmCalculator.cpp +mmex_tests_mmCalculator.o: $(srcdir)/../src/mmCalculator.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmCalculator.cpp -mmex_tests_mmOption.o: $(srcdir)/../../src/mmOption.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmOption.cpp +mmex_tests_mmOption.o: $(srcdir)/../src/mmOption.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmOption.cpp -mmex_tests_mmcheckingpanel.o: $(srcdir)/../../src/mmcheckingpanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmcheckingpanel.cpp +mmex_tests_mmcheckingpanel.o: $(srcdir)/../src/mmcheckingpanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmcheckingpanel.cpp -mmex_tests_mmex.o: $(srcdir)/../../src/mmex.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmex.cpp +mmex_tests_mmex.o: $(srcdir)/../src/mmex.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmex.cpp -mmex_tests_mmframe.o: $(srcdir)/../../src/mmframe.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmframe.cpp +mmex_tests_mmframe.o: $(srcdir)/../src/mmframe.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmframe.cpp -mmex_tests_mmhelppanel.o: $(srcdir)/../../src/mmhelppanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmhelppanel.cpp +mmex_tests_mmhelppanel.o: $(srcdir)/../src/mmhelppanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmhelppanel.cpp -mmex_tests_mmhomepagepanel.o: $(srcdir)/../../src/mmhomepagepanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmhomepagepanel.cpp +mmex_tests_mmhomepagepanel.o: $(srcdir)/../src/mmhomepagepanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmhomepagepanel.cpp -mmex_tests_mmreportspanel.o: $(srcdir)/../../src/mmreportspanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/mmreportspanel.cpp +mmex_tests_mmreportspanel.o: $(srcdir)/../src/mmreportspanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/mmreportspanel.cpp -mmex_tests_optionsdialog.o: $(srcdir)/../../src/optionsdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/optionsdialog.cpp +mmex_tests_optionsdialog.o: $(srcdir)/../src/optionsdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/optionsdialog.cpp -mmex_tests_paths.o: $(srcdir)/../../src/paths.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/paths.cpp +mmex_tests_paths.o: $(srcdir)/../src/paths.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/paths.cpp -mmex_tests_payeedialog.o: $(srcdir)/../../src/payeedialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/payeedialog.cpp +mmex_tests_payeedialog.o: $(srcdir)/../src/payeedialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/payeedialog.cpp -mmex_tests_recentfiles.o: $(srcdir)/../../src/recentfiles.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/recentfiles.cpp +mmex_tests_recentfiles.o: $(srcdir)/../src/recentfiles.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/recentfiles.cpp -mmex_tests_relocatecategorydialog.o: $(srcdir)/../../src/relocatecategorydialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/relocatecategorydialog.cpp +mmex_tests_relocatecategorydialog.o: $(srcdir)/../src/relocatecategorydialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/relocatecategorydialog.cpp -mmex_tests_relocatepayeedialog.o: $(srcdir)/../../src/relocatepayeedialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/relocatepayeedialog.cpp +mmex_tests_relocatepayeedialog.o: $(srcdir)/../src/relocatepayeedialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/relocatepayeedialog.cpp -mmex_tests_splitdetailsdialog.o: $(srcdir)/../../src/splitdetailsdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/splitdetailsdialog.cpp +mmex_tests_splitdetailsdialog.o: $(srcdir)/../src/splitdetailsdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/splitdetailsdialog.cpp -mmex_tests_splittransactionsdialog.o: $(srcdir)/../../src/splittransactionsdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/splittransactionsdialog.cpp +mmex_tests_splittransactionsdialog.o: $(srcdir)/../src/splittransactionsdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/splittransactionsdialog.cpp -mmex_tests_stockdialog.o: $(srcdir)/../../src/stockdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/stockdialog.cpp +mmex_tests_stockdialog.o: $(srcdir)/../src/stockdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/stockdialog.cpp -mmex_tests_stockspanel.o: $(srcdir)/../../src/stockspanel.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/stockspanel.cpp +mmex_tests_stockspanel.o: $(srcdir)/../src/stockspanel.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/stockspanel.cpp -mmex_tests_transdialog.o: $(srcdir)/../../src/transdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/transdialog.cpp +mmex_tests_transdialog.o: $(srcdir)/../src/transdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/transdialog.cpp -mmex_tests_util.o: $(srcdir)/../../src/util.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/util.cpp +mmex_tests_util.o: $(srcdir)/../src/util.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/util.cpp -mmex_tests_webapp.o: $(srcdir)/../../src/webapp.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/webapp.cpp +mmex_tests_webapp.o: $(srcdir)/../src/webapp.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/webapp.cpp -mmex_tests_webserver.o: $(srcdir)/../../src/webserver.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/webserver.cpp +mmex_tests_webserver.o: $(srcdir)/../src/webserver.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/webserver.cpp -mmex_tests_wizard_newaccount.o: $(srcdir)/../../src/wizard_newaccount.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/wizard_newaccount.cpp +mmex_tests_wizard_newaccount.o: $(srcdir)/../src/wizard_newaccount.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/wizard_newaccount.cpp -mmex_tests_wizard_newdb.o: $(srcdir)/../../src/wizard_newdb.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/wizard_newdb.cpp +mmex_tests_wizard_newdb.o: $(srcdir)/../src/wizard_newdb.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/wizard_newdb.cpp -mmex_tests_budget.o: $(srcdir)/../../src/reports/budget.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/budget.cpp +mmex_tests_budget.o: $(srcdir)/../src/reports/budget.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/budget.cpp -mmex_tests_budgetcategorysummary.o: $(srcdir)/../../src/reports/budgetcategorysummary.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/budgetcategorysummary.cpp +mmex_tests_budgetcategorysummary.o: $(srcdir)/../src/reports/budgetcategorysummary.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/budgetcategorysummary.cpp -mmex_tests_budgetingperf.o: $(srcdir)/../../src/reports/budgetingperf.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/budgetingperf.cpp +mmex_tests_budgetingperf.o: $(srcdir)/../src/reports/budgetingperf.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/budgetingperf.cpp -mmex_tests_cashflow.o: $(srcdir)/../../src/reports/cashflow.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/cashflow.cpp +mmex_tests_cashflow.o: $(srcdir)/../src/reports/cashflow.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/cashflow.cpp -mmex_tests_categexp.o: $(srcdir)/../../src/reports/categexp.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/categexp.cpp +mmex_tests_categexp.o: $(srcdir)/../src/reports/categexp.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/categexp.cpp -mmex_tests_categovertimeperf.o: $(srcdir)/../../src/reports/categovertimeperf.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/categovertimeperf.cpp +mmex_tests_categovertimeperf.o: $(srcdir)/../src/reports/categovertimeperf.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/categovertimeperf.cpp -mmex_tests_chart.o: $(srcdir)/../../src/reports/chart.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/chart.cpp +mmex_tests_chart.o: $(srcdir)/../src/reports/chart.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/chart.cpp -mmex_tests_html_widget_bills_and_deposits.o: $(srcdir)/../../src/reports/html_widget_bills_and_deposits.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/html_widget_bills_and_deposits.cpp +mmex_tests_html_widget_bills_and_deposits.o: $(srcdir)/../src/reports/html_widget_bills_and_deposits.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/html_widget_bills_and_deposits.cpp -mmex_tests_html_widget_stocks.o: $(srcdir)/../../src/reports/html_widget_stocks.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/html_widget_stocks.cpp +mmex_tests_html_widget_stocks.o: $(srcdir)/../src/reports/html_widget_stocks.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/html_widget_stocks.cpp -mmex_tests_html_widget_top_categories.o: $(srcdir)/../../src/reports/html_widget_top_categories.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/html_widget_top_categories.cpp +mmex_tests_html_widget_top_categories.o: $(srcdir)/../src/reports/html_widget_top_categories.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/html_widget_top_categories.cpp -mmex_tests_htmlbuilder.o: $(srcdir)/../../src/reports/htmlbuilder.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/htmlbuilder.cpp +mmex_tests_htmlbuilder.o: $(srcdir)/../src/reports/htmlbuilder.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/htmlbuilder.cpp -mmex_tests_incexpenses.o: $(srcdir)/../../src/reports/incexpenses.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/incexpenses.cpp +mmex_tests_incexpenses.o: $(srcdir)/../src/reports/incexpenses.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/incexpenses.cpp -mmex_tests_mmDateRange.o: $(srcdir)/../../src/reports/mmDateRange.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/mmDateRange.cpp +mmex_tests_mmDateRange.o: $(srcdir)/../src/reports/mmDateRange.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/mmDateRange.cpp -mmex_tests_mmgraphgenerator.o: $(srcdir)/../../src/reports/mmgraphgenerator.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/mmgraphgenerator.cpp +mmex_tests_mmgraphgenerator.o: $(srcdir)/../src/reports/mmgraphgenerator.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/mmgraphgenerator.cpp -mmex_tests_mmgraphincexpensesmonth.o: $(srcdir)/../../src/reports/mmgraphincexpensesmonth.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/mmgraphincexpensesmonth.cpp +mmex_tests_mmgraphincexpensesmonth.o: $(srcdir)/../src/reports/mmgraphincexpensesmonth.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/mmgraphincexpensesmonth.cpp -mmex_tests_mmgraphpie.o: $(srcdir)/../../src/reports/mmgraphpie.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/mmgraphpie.cpp +mmex_tests_mmgraphpie.o: $(srcdir)/../src/reports/mmgraphpie.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/mmgraphpie.cpp -mmex_tests_mmgraphtopcategories.o: $(srcdir)/../../src/reports/mmgraphtopcategories.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/mmgraphtopcategories.cpp +mmex_tests_mmgraphtopcategories.o: $(srcdir)/../src/reports/mmgraphtopcategories.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/mmgraphtopcategories.cpp -mmex_tests_payee.o: $(srcdir)/../../src/reports/payee.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/payee.cpp +mmex_tests_payee.o: $(srcdir)/../src/reports/payee.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/payee.cpp -mmex_tests_reportbase.o: $(srcdir)/../../src/reports/reportbase.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/reportbase.cpp +mmex_tests_reportbase.o: $(srcdir)/../src/reports/reportbase.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/reportbase.cpp -mmex_tests_transactions.o: $(srcdir)/../../src/reports/transactions.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/transactions.cpp +mmex_tests_transactions.o: $(srcdir)/../src/reports/transactions.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/reports/transactions.cpp -mmex_tests_platfdep.o: $(srcdir)/../../src/unix/platfdep.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/unix/platfdep.cpp +mmex_tests_platfdep.o: $(srcdir)/../src/unix/platfdep.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/unix/platfdep.cpp -mmex_tests_export.o: $(srcdir)/../../src/import_export/export.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/import_export/export.cpp +mmex_tests_export.o: $(srcdir)/../src/import_export/export.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/import_export/export.cpp -mmex_tests_qif_export.o: $(srcdir)/../../src/import_export/qif_export.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/import_export/qif_export.cpp +mmex_tests_qif_export.o: $(srcdir)/../src/import_export/qif_export.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/import_export/qif_export.cpp -mmex_tests_qif_import.o: $(srcdir)/../../src/import_export/qif_import.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/import_export/qif_import.cpp +mmex_tests_qif_import.o: $(srcdir)/../src/import_export/qif_import.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/import_export/qif_import.cpp -mmex_tests_qif_import_gui.o: $(srcdir)/../../src/import_export/qif_import_gui.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/import_export/qif_import_gui.cpp +mmex_tests_qif_import_gui.o: $(srcdir)/../src/import_export/qif_import_gui.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/import_export/qif_import_gui.cpp -mmex_tests_univcsvdialog.o: $(srcdir)/../../src/import_export/univcsvdialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/import_export/univcsvdialog.cpp +mmex_tests_univcsvdialog.o: $(srcdir)/../src/import_export/univcsvdialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/import_export/univcsvdialog.cpp -mmex_tests_Model_Account.o: $(srcdir)/../../src/model/Model_Account.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Account.cpp +mmex_tests_Model_Account.o: $(srcdir)/../src/model/Model_Account.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Account.cpp -mmex_tests_Model_Asset.o: $(srcdir)/../../src/model/Model_Asset.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Asset.cpp +mmex_tests_Model_Asset.o: $(srcdir)/../src/model/Model_Asset.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Asset.cpp -mmex_tests_Model_Attachment.o: $(srcdir)/../../src/model/Model_Attachment.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Attachment.cpp +mmex_tests_Model_Attachment.o: $(srcdir)/../src/model/Model_Attachment.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Attachment.cpp -mmex_tests_Model_Billsdeposits.o: $(srcdir)/../../src/model/Model_Billsdeposits.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Billsdeposits.cpp +mmex_tests_Model_Billsdeposits.o: $(srcdir)/../src/model/Model_Billsdeposits.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Billsdeposits.cpp -mmex_tests_Model_Budget.o: $(srcdir)/../../src/model/Model_Budget.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Budget.cpp +mmex_tests_Model_Budget.o: $(srcdir)/../src/model/Model_Budget.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Budget.cpp -mmex_tests_Model_Budgetsplittransaction.o: $(srcdir)/../../src/model/Model_Budgetsplittransaction.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Budgetsplittransaction.cpp +mmex_tests_Model_Budgetsplittransaction.o: $(srcdir)/../src/model/Model_Budgetsplittransaction.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Budgetsplittransaction.cpp -mmex_tests_Model_Budgetyear.o: $(srcdir)/../../src/model/Model_Budgetyear.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Budgetyear.cpp +mmex_tests_Model_Budgetyear.o: $(srcdir)/../src/model/Model_Budgetyear.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Budgetyear.cpp -mmex_tests_Model_Category.o: $(srcdir)/../../src/model/Model_Category.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Category.cpp +mmex_tests_Model_Category.o: $(srcdir)/../src/model/Model_Category.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Category.cpp -mmex_tests_Model_Checking.o: $(srcdir)/../../src/model/Model_Checking.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Checking.cpp +mmex_tests_Model_Checking.o: $(srcdir)/../src/model/Model_Checking.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Checking.cpp -mmex_tests_Model_Currency.o: $(srcdir)/../../src/model/Model_Currency.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Currency.cpp +mmex_tests_Model_Currency.o: $(srcdir)/../src/model/Model_Currency.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Currency.cpp -mmex_tests_Model_Infotable.o: $(srcdir)/../../src/model/Model_Infotable.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Infotable.cpp +mmex_tests_Model_Infotable.o: $(srcdir)/../src/model/Model_Infotable.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Infotable.cpp -mmex_tests_Model_Payee.o: $(srcdir)/../../src/model/Model_Payee.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Payee.cpp +mmex_tests_Model_Payee.o: $(srcdir)/../src/model/Model_Payee.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Payee.cpp -mmex_tests_Model_Report.o: $(srcdir)/../../src/model/Model_Report.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Report.cpp +mmex_tests_Model_Report.o: $(srcdir)/../src/model/Model_Report.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Report.cpp -mmex_tests_Model_Setting.o: $(srcdir)/../../src/model/Model_Setting.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Setting.cpp +mmex_tests_Model_Setting.o: $(srcdir)/../src/model/Model_Setting.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Setting.cpp -mmex_tests_Model_Splittransaction.o: $(srcdir)/../../src/model/Model_Splittransaction.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Splittransaction.cpp +mmex_tests_Model_Splittransaction.o: $(srcdir)/../src/model/Model_Splittransaction.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Splittransaction.cpp -mmex_tests_Model_Stock.o: $(srcdir)/../../src/model/Model_Stock.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Stock.cpp +mmex_tests_Model_Stock.o: $(srcdir)/../src/model/Model_Stock.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Stock.cpp -mmex_tests_Model_Subcategory.o: $(srcdir)/../../src/model/Model_Subcategory.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Subcategory.cpp +mmex_tests_Model_Subcategory.o: $(srcdir)/../src/model/Model_Subcategory.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Subcategory.cpp -mmex_tests_Model_Usage.o: $(srcdir)/../../src/model/Model_Usage.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/model/Model_Usage.cpp +mmex_tests_Model_Usage.o: $(srcdir)/../src/model/Model_Usage.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../src/model/Model_Usage.cpp -mmex_tests_html_template.o: $(srcdir)/../../3rd/cgitemplate/html_template.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../3rd/cgitemplate/html_template.cpp +mmex_tests_html_template.o: $(srcdir)/../3rd/cgitemplate/html_template.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../3rd/cgitemplate/html_template.cpp -mmex_tests_mongoose.o: $(srcdir)/../../3rd/mongoose/mongoose.c - $(CCC) -c -o $@ $(MMEX_TESTS_CFLAGS) $(srcdir)/../../3rd/mongoose/mongoose.c +mmex_tests_mongoose.o: $(srcdir)/../3rd/mongoose/mongoose.c + $(CCC) -c -o $@ $(MMEX_TESTS_CFLAGS) $(srcdir)/../3rd/mongoose/mongoose.c -mmex_tests_csv_parser.o: $(srcdir)/../../3rd/csv-parser/csv_parser.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../3rd/csv-parser/csv_parser.cpp +mmex_tests_csv_parser.o: $(srcdir)/../3rd/csv-parser/csv_parser.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../3rd/csv-parser/csv_parser.cpp -mmex_tests_cpu_timer.o: $(srcdir)/../../src/tests/cpu_timer.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/cpu_timer.cpp +mmex_tests_cpu_timer.o: $(srcdir)/../tests/cpu_timer.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/cpu_timer.cpp -mmex_tests_db_init_model.o: $(srcdir)/../../src/tests/db_init_model.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/db_init_model.cpp +mmex_tests_db_init_model.o: $(srcdir)/../tests/db_init_model.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/db_init_model.cpp -mmex_tests_framebase_tests.o: $(srcdir)/../../src/tests/framebase_tests.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/framebase_tests.cpp +mmex_tests_framebase_tests.o: $(srcdir)/../tests/framebase_tests.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/framebase_tests.cpp -mmex_tests_mmex_tests.o: $(srcdir)/../../src/tests/mmex_tests.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/mmex_tests.cpp +mmex_tests_mmex_tests.o: $(srcdir)/../tests/mmex_tests.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/mmex_tests.cpp -mmex_tests_test_about_dialog.o: $(srcdir)/../../src/tests/test_about_dialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_about_dialog.cpp +mmex_tests_test_about_dialog.o: $(srcdir)/../tests/test_about_dialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_about_dialog.cpp -mmex_tests_test_assets.o: $(srcdir)/../../src/tests/test_assets.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_assets.cpp +mmex_tests_test_assets.o: $(srcdir)/../tests/test_assets.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_assets.cpp -mmex_tests_test_billsdeposits.o: $(srcdir)/../../src/tests/test_billsdeposits.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_billsdeposits.cpp +mmex_tests_test_billsdeposits.o: $(srcdir)/../tests/test_billsdeposits.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_billsdeposits.cpp -mmex_tests_test_callback_hooks.o: $(srcdir)/../../src/tests/test_callback_hooks.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_callback_hooks.cpp +mmex_tests_test_callback_hooks.o: $(srcdir)/../tests/test_callback_hooks.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_callback_hooks.cpp -mmex_tests_test_checking.o: $(srcdir)/../../src/tests/test_checking.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_checking.cpp +mmex_tests_test_checking.o: $(srcdir)/../tests/test_checking.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_checking.cpp -mmex_tests_test_currency.o: $(srcdir)/../../src/tests/test_currency.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_currency.cpp +mmex_tests_test_currency.o: $(srcdir)/../tests/test_currency.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_currency.cpp -mmex_tests_test_database_initialisation.o: $(srcdir)/../../src/tests/test_database_initialisation.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_database_initialisation.cpp +mmex_tests_test_database_initialisation.o: $(srcdir)/../tests/test_database_initialisation.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_database_initialisation.cpp -mmex_tests_test_date_range.o: $(srcdir)/../../src/tests/test_date_range.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_date_range.cpp +mmex_tests_test_date_range.o: $(srcdir)/../tests/test_date_range.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_date_range.cpp -mmex_tests_test_filtertrans_dialog.o: $(srcdir)/../../src/tests/test_filtertrans_dialog.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_filtertrans_dialog.cpp +mmex_tests_test_filtertrans_dialog.o: $(srcdir)/../tests/test_filtertrans_dialog.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_filtertrans_dialog.cpp -mmex_tests_test_relocate_category.o: $(srcdir)/../../src/tests/test_relocate_category.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_relocate_category.cpp +mmex_tests_test_relocate_category.o: $(srcdir)/../tests/test_relocate_category.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_relocate_category.cpp -mmex_tests_test_relocate_payee.o: $(srcdir)/../../src/tests/test_relocate_payee.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_relocate_payee.cpp +mmex_tests_test_relocate_payee.o: $(srcdir)/../tests/test_relocate_payee.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_relocate_payee.cpp -mmex_tests_test_stocks.o: $(srcdir)/../../src/tests/test_stocks.cpp - $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/tests/test_stocks.cpp +mmex_tests_test_stocks.o: $(srcdir)/../tests/test_stocks.cpp + $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../tests/test_stocks.cpp -mmex_tests_mmex_tests_rc.o: $(srcdir)/../../src/tests/mmex_tests.rc - $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/../../lib/wxsqlite3/sqlite3/secure/src --include-dir $(srcdir)/../../lib/wxsqlite3/include --include-dir $(srcdir)/../../lib/lua/src --include-dir $(srcdir)/../../lib --include-dir $(srcdir)/../../3rd --include-dir $(srcdir)/../../3rd/LuaGlue/include --include-dir $(srcdir)/../../3rd/cgitemplate --include-dir $(srcdir)/../../3rd/csv-parser/include --include-dir $(srcdir)/../../src --define NOPCH --include-dir $(srcdir)/../../src --include-dir $(srcdir)/../../lib/cppunit/include +mmex_tests_mmex_tests_rc.o: $(srcdir)/../tests/mmex_tests.rc + $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/../lib/wxsqlite3/sqlite3/secure/src --include-dir $(srcdir)/../lib/wxsqlite3/include --include-dir $(srcdir)/../lib/lua/src --include-dir $(srcdir)/../lib --include-dir $(srcdir)/../3rd --include-dir $(srcdir)/../3rd/LuaGlue/include --include-dir $(srcdir)/../3rd/cgitemplate --include-dir $(srcdir)/../3rd/csv-parser/include --include-dir $(srcdir)/../src --define NOPCH --include-dir $(srcdir)/../src --include-dir $(srcdir)/../lib/cppunit/include # Include dependency info, if present: This was sent by MMEX an easy to use, money management application. |
From: <ste...@us...> - 2014-05-15 11:31:51
|
Revision: 6584 http://sourceforge.net/p/moneymanagerex/code/6584 Author: stef145g Date: 2014-05-15 11:31:48 +0000 (Thu, 15 May 2014) Log Message: ----------- Fix: Tests - Build selection. Modified Paths: -------------- trunk/src/search/Search.h trunk/src/tests/defined_test_selection.h trunk/src/tests/test_about_dialog.cpp trunk/src/tests/test_assets.cpp trunk/src/tests/test_billsdeposits.cpp trunk/src/tests/test_callback_hooks.cpp trunk/src/tests/test_checking.cpp trunk/src/tests/test_currency.cpp trunk/src/tests/test_database_initialisation.cpp trunk/src/tests/test_date_range.cpp trunk/src/tests/test_filtertrans_dialog.cpp trunk/src/tests/test_relocate_category.cpp trunk/src/tests/test_relocate_payee.cpp trunk/src/tests/test_stocks.cpp Modified: trunk/src/search/Search.h =================================================================== --- trunk/src/search/Search.h 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/search/Search.h 2014-05-15 11:31:48 UTC (rev 6584) @@ -64,7 +64,7 @@ o[column_name] = json::String(q.GetString(i).ToStdString()); break; case WXSQLITE_NULL: - defaut: + default: break; } } Modified: trunk/src/tests/defined_test_selection.h =================================================================== --- trunk/src/tests/defined_test_selection.h 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/defined_test_selection.h 2014-05-15 11:31:48 UTC (rev 6584) @@ -10,14 +10,14 @@ ******************************************************************************/ #define MMEX_TESTS_ABOUT_DIALOG -//#define MMEX_TESTS_ASSETS -//#define MMEX_TESTS_BILLS_DEPOSITS -//#define MMEX_TESTS_CALLBACK_HOOKS -//#define MMEX_TESTS_CHECKING -//#define MMEX_TESTS_CURRENCY -//#define MMEX_TESTS_FILTER_TRANS_DIALOG -//#define MMEX_TESTS_RELOCATE_CATEGORY -//#define MMEX_TESTS_RELOCATE_PAYEE +#define MMEX_TESTS_ASSETS +#define MMEX_TESTS_BILLS_DEPOSITS +#define MMEX_TESTS_CALLBACK_HOOKS +#define MMEX_TESTS_CHECKING +#define MMEX_TESTS_CURRENCY +#define MMEX_TESTS_FILTER_TRANS_DIALOG +#define MMEX_TESTS_RELOCATE_CATEGORY +#define MMEX_TESTS_RELOCATE_PAYEE #define MMEX_TESTS_STOCKS #define MMEX_TESTS_TEST_DATABASE_INITIALISATION #define MMEX_TESTS_TEST_DATE_RANGE Modified: trunk/src/tests/test_about_dialog.cpp =================================================================== --- trunk/src/tests/test_about_dialog.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_about_dialog.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -30,7 +30,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__ABOUT_DIALOG +#ifdef MMEX_TESTS_ABOUT_DIALOG // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION( Test_About_Dialog ); #endif Modified: trunk/src/tests/test_assets.cpp =================================================================== --- trunk/src/tests/test_assets.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_assets.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -31,7 +31,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__ASSETS +#ifdef MMEX_TESTS_ASSETS // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Asset); #endif Modified: trunk/src/tests/test_billsdeposits.cpp =================================================================== --- trunk/src/tests/test_billsdeposits.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_billsdeposits.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -35,7 +35,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__BILLS_DEPOSITS +#ifdef MMEX_TESTS_BILLS_DEPOSITS // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_BillsDeposits); #endif Modified: trunk/src/tests/test_callback_hooks.cpp =================================================================== --- trunk/src/tests/test_callback_hooks.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_callback_hooks.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -31,7 +31,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__CALLBACK_HOOKS +#ifdef MMEX_TESTS_CALLBACK_HOOKS // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Callback_Hooks); #endif Modified: trunk/src/tests/test_checking.cpp =================================================================== --- trunk/src/tests/test_checking.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_checking.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -32,7 +32,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__CHECKING +#ifdef MMEX_TESTS_CHECKING // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Checking); #endif Modified: trunk/src/tests/test_currency.cpp =================================================================== --- trunk/src/tests/test_currency.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_currency.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -29,7 +29,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__CURRENCY +#ifdef MMEX_TESTS_CURRENCY // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Currency); #endif Modified: trunk/src/tests/test_database_initialisation.cpp =================================================================== --- trunk/src/tests/test_database_initialisation.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_database_initialisation.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -31,7 +31,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__TEST_DATABASE_INITIALISATION +#ifdef MMEX_TESTS_TEST_DATABASE_INITIALISATION // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_DatabaseInitialisation); #endif Modified: trunk/src/tests/test_date_range.cpp =================================================================== --- trunk/src/tests/test_date_range.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_date_range.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -30,7 +30,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__TEST_DATE_RANGE +#ifdef MMEX_TESTS_TEST_DATE_RANGE // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Date_Range); #endif Modified: trunk/src/tests/test_filtertrans_dialog.cpp =================================================================== --- trunk/src/tests/test_filtertrans_dialog.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_filtertrans_dialog.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -40,7 +40,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__FILTER_TRANS_DIALOG +#ifdef MMEX_TESTS_FILTER_TRANS_DIALOG // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION( Test_FilterTrans_Dialog ); #endif Modified: trunk/src/tests/test_relocate_category.cpp =================================================================== --- trunk/src/tests/test_relocate_category.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_relocate_category.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -40,7 +40,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__RELOCATE_CATEGORY +#ifdef MMEX_TESTS_RELOCATE_CATEGORY // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION( Test_Relocate_Category ); #endif Modified: trunk/src/tests/test_relocate_payee.cpp =================================================================== --- trunk/src/tests/test_relocate_payee.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_relocate_payee.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -35,7 +35,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__RELOCATE_PAYEE +#ifdef MMEX_TESTS_RELOCATE_PAYEE // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION( Test_Relocate_Payee ); #endif Modified: trunk/src/tests/test_stocks.cpp =================================================================== --- trunk/src/tests/test_stocks.cpp 2014-05-14 12:41:53 UTC (rev 6583) +++ trunk/src/tests/test_stocks.cpp 2014-05-15 11:31:48 UTC (rev 6584) @@ -32,7 +32,7 @@ *****************************************************************************/ #include "defined_test_selection.h" -#ifdef __MMEX_TESTS__STOCKS +#ifdef MMEX_TESTS_STOCKS // Registers the fixture into the 'registry' CPPUNIT_TEST_SUITE_REGISTRATION(Test_Stock); #endif This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-14 12:41:56
|
Revision: 6583 http://sourceforge.net/p/moneymanagerex/code/6583 Author: guanlisheng Date: 2014-05-14 12:41:53 +0000 (Wed, 14 May 2014) Log Message: ----------- more qif reference Modified Paths: -------------- trunk/src/import_export/qif_import.h Modified: trunk/src/import_export/qif_import.h =================================================================== --- trunk/src/import_export/qif_import.h 2014-05-14 12:28:56 UTC (rev 6582) +++ trunk/src/import_export/qif_import.h 2014-05-14 12:41:53 UTC (rev 6583) @@ -24,6 +24,8 @@ // http://en.wikipedia.org/wiki/QIF // http://linuxfinances.info/info/financeformats.html +// https://metacpan.org/pod/Finance::QIF +// https://github.com/Gnucash/gnucash/blob/master/src/import-export/qif-imp/file-format.txt struct QIF_Account { This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-14 12:28:59
|
Revision: 6582 http://sourceforge.net/p/moneymanagerex/code/6582 Author: guanlisheng Date: 2014-05-14 12:28:56 +0000 (Wed, 14 May 2014) Log Message: ----------- qif Modified Paths: -------------- trunk/src/import_export/qif_import.h Modified: trunk/src/import_export/qif_import.h =================================================================== --- trunk/src/import_export/qif_import.h 2014-05-14 12:02:52 UTC (rev 6581) +++ trunk/src/import_export/qif_import.h 2014-05-14 12:28:56 UTC (rev 6582) @@ -23,18 +23,56 @@ #include <vector> // http://en.wikipedia.org/wiki/QIF +// http://linuxfinances.info/info/financeformats.html + +struct QIF_Account +{ + wxString N; // Account name + wxString T; // Account type +}; + struct QIF_Transaction { - wxString D; - wxString T; - wxString M; - wxString C; - wxString N; - wxString A; - wxString L; - wxString F; + wxString D; // Date + wxString T; // Amount + wxString C; // Cleared status + wxString N; // Number (check or reference) + wxString P; // Payee/description + wxString M; // Memo + wxString A; // Address (up to 5 lines; 6th line is an optional message) + wxString L; // Category/class or transfer/class + wxString S; // Category in split (category/class or transfer/class) + wxString E; // Memo in split + wxString DOLLOR; // Dollar amount of split + wxString CARET; // End of entry }; +struct QIF_Invst_Transaction +{ + wxString D; // Date (optional) + wxString N; // Action + wxString Y; // Security + wxString I; // Price + wxString Q; // Quantity ( of shares or split ratio) + wxString C; // Cleared status + wxString P; // 1st line text for transfers/reminders + wxString M; // Memo + wxString O; // Commission + wxString L; /* For MiscIncX or MiscExpX actions, Category/classtransfer/class or transfer/class + For all other actions, Category/class or transfer/class */ + wxString DOLLOR; // Amount transferred + wxString CARET; // End of entry (required) +}; + +struct QIF_Category +{ + wxString N; // Category name + wxString D; // Verbose Category name + wxString T; // Is this category relevant to taxes? + wxString E; // Expense account? + wxString R; // Appears to be an indicator of a "Tax Account," or something of the sort. +}; + enum qifLineType { AcctType = 1, // ! This was sent by MMEX an easy to use, money management application. |
From: <gua...@us...> - 2014-05-14 12:02:55
|
Revision: 6581 http://sourceforge.net/p/moneymanagerex/code/6581 Author: guanlisheng Date: 2014-05-14 12:02:52 +0000 (Wed, 14 May 2014) Log Message: ----------- return const set Modified Paths: -------------- trunk/src/model/Model_Attachment.cpp trunk/src/model/Model_Attachment.h trunk/src/model/Model_Billsdeposits.cpp trunk/src/model/Model_Billsdeposits.h trunk/src/model/Model_Checking.cpp trunk/src/model/Model_Checking.h Modified: trunk/src/model/Model_Attachment.cpp =================================================================== --- trunk/src/model/Model_Attachment.cpp 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Attachment.cpp 2014-05-14 12:02:52 UTC (rev 6581) @@ -58,7 +58,7 @@ } /** Return a dataset with attachments linked to a specific object */ -Model_Attachment::Data_Set Model_Attachment::FilterAttachments(const wxString& RefType, const int RefId) +const Model_Attachment::Data_Set Model_Attachment::FilterAttachments(const wxString& RefType, const int RefId) { Data_Set attachments; for (auto &attachment : this->all(COL_DESCRIPTION)) Modified: trunk/src/model/Model_Attachment.h =================================================================== --- trunk/src/model/Model_Attachment.h 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Attachment.h 2014-05-14 12:02:52 UTC (rev 6581) @@ -51,7 +51,7 @@ public: /** Return a dataset with attachments linked to a specific object */ - Data_Set FilterAttachments(const wxString& RefType, const int RefId); + const Data_Set FilterAttachments(const wxString& RefType, const int RefId); /** Return the number of attachments linked to a specific object */ static int NrAttachments(const wxString& RefType, const int RefId); Modified: trunk/src/model/Model_Billsdeposits.cpp =================================================================== --- trunk/src/model/Model_Billsdeposits.cpp 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Billsdeposits.cpp 2014-05-14 12:02:52 UTC (rev 6581) @@ -162,12 +162,12 @@ return DB_Table_BILLSDEPOSITS_V1::TRANSCODE(all_type()[type], op); } -Model_Budgetsplittransaction::Data_Set Model_Billsdeposits::splittransaction(const Data* r) +const Model_Budgetsplittransaction::Data_Set Model_Billsdeposits::splittransaction(const Data* r) { return Model_Budgetsplittransaction::instance().find(Model_Budgetsplittransaction::TRANSID(r->BDID)); } -Model_Budgetsplittransaction::Data_Set Model_Billsdeposits::splittransaction(const Data& r) +const Model_Budgetsplittransaction::Data_Set Model_Billsdeposits::splittransaction(const Data& r) { return Model_Budgetsplittransaction::instance().find(Model_Budgetsplittransaction::TRANSID(r.BDID)); } Modified: trunk/src/model/Model_Billsdeposits.h =================================================================== --- trunk/src/model/Model_Billsdeposits.h 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Billsdeposits.h 2014-05-14 12:02:52 UTC (rev 6581) @@ -131,8 +131,8 @@ static DB_Table_BILLSDEPOSITS_V1::STATUS STATUS(STATUS_ENUM status, OP op = EQUAL); static DB_Table_BILLSDEPOSITS_V1::TRANSCODE TRANSCODE(TYPE type, OP op = EQUAL); - static Model_Budgetsplittransaction::Data_Set splittransaction(const Data* r); - static Model_Budgetsplittransaction::Data_Set splittransaction(const Data& r); + static const Model_Budgetsplittransaction::Data_Set splittransaction(const Data* r); + static const Model_Budgetsplittransaction::Data_Set splittransaction(const Data& r); void completeBDInSeries(int bdID); }; Modified: trunk/src/model/Model_Checking.cpp =================================================================== --- trunk/src/model/Model_Checking.cpp 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Checking.cpp 2014-05-14 12:02:52 UTC (rev 6581) @@ -90,12 +90,12 @@ return this->remove(id, db_); } -Model_Splittransaction::Data_Set Model_Checking::splittransaction(const Data* r) +const Model_Splittransaction::Data_Set Model_Checking::splittransaction(const Data* r) { return Model_Splittransaction::instance().find(Model_Splittransaction::TRANSID(r->TRANSID)); } -Model_Splittransaction::Data_Set Model_Checking::splittransaction(const Data& r) +const Model_Splittransaction::Data_Set Model_Checking::splittransaction(const Data& r) { return Model_Splittransaction::instance().find(Model_Splittransaction::TRANSID(r.TRANSID)); } Modified: trunk/src/model/Model_Checking.h =================================================================== --- trunk/src/model/Model_Checking.h 2014-05-14 07:16:28 UTC (rev 6580) +++ trunk/src/model/Model_Checking.h 2014-05-14 12:02:52 UTC (rev 6581) @@ -119,8 +119,8 @@ bool remove(int id); public: - static Model_Splittransaction::Data_Set splittransaction(const Data* r); - static Model_Splittransaction::Data_Set splittransaction(const Data& r); + static const Model_Splittransaction::Data_Set splittransaction(const Data* r); + static const Model_Splittransaction::Data_Set splittransaction(const Data& r); public: static DB_Table_CHECKINGACCOUNT_V1::TRANSDATE TRANSDATE(const wxDate& date, OP op = EQUAL); This was sent by MMEX an easy to use, money management application. |