Commit graph

4230 commits

Author SHA1 Message Date
Amar Takhar 29f02c515b Move buttons from 16/* and 24/* to button/*_(16|24).png. This is a closer representation of what they're like in-source and in the future we'll only have 1 version of each icon
Originally committed to SVN as r5166.
2011-01-11 16:57:44 +00:00
Amar Takhar 9d34dfb01c Rewrite respack in pure C++, this is required to make cross-compiling sane.
Originally committed to SVN as r5165.
2011-01-11 16:55:15 +00:00
Amar Takhar a02fee90c3 Add a quick script used for distfile building. I don't see any reason to support a pure makefile solution and make it unnecessarily complex. In the future if anyone feels they may want to use this build system I'll change it otherwise we'll use this for now.
Originally committed to SVN as r5164.
2011-01-10 21:33:58 +00:00
Amar Takhar 7a8829efdc Remove Makefile.inc from EXTRA_DIST
Originally committed to SVN as r5163.
2011-01-10 21:32:54 +00:00
Amar Takhar 03ca62df22 Include dependency files into the Makefiles. This gives us dep tracking for headers.
Originally committed to SVN as r5162.
2011-01-10 21:27:39 +00:00
Niels Martin Hansen 0d6edabbdc Prettify the property files a bit and add some real sample files for the userconfig dir.
Originally committed to SVN as r5161.
2011-01-10 17:46:15 +00:00
Niels Martin Hansen 5f7fbf48c6 Use project relative paths for source files, to work around this (possible) MSBuild bug:
https://connect.microsoft.com/VisualStudio/feedback/details/635294/using-absolute-path-in-clcompile-item-prevents-property-pages-from-showing

Originally committed to SVN as r5160.
2011-01-10 01:27:12 +00:00
Niels Martin Hansen 231220cc63 Oops, left in an Import that shouldn't be there anyway.
Originally committed to SVN as r5159.
2011-01-09 23:06:01 +00:00
Karl Blomster a90d855950 update ffms2 to r409
Originally committed to SVN as r5158.
2011-01-09 21:47:46 +00:00
Niels Martin Hansen a08eb28846 MSBuild projects for the contrib libraries, except CSRI.
There is an odd bug/glitch where it is impossible to view property pages for single source files through the VS 2010 IDE, but compilation works as intended.

Originally committed to SVN as r5157.
2011-01-09 08:01:57 +00:00
Niels Martin Hansen 95c2649721 Add a bunch more property files for MSBuild projects
Originally committed to SVN as r5156.
2011-01-09 07:08:36 +00:00
Amar Takhar c2a81a5dd7 Add a cast to make x64 build on windows happy.
Originally committed to SVN as r5155.
2011-01-09 02:49:49 +00:00
Amar Takhar e1a59d307e * Fix iconv LDFLAGS for *bsd*
* Minor style fix for $GL_LIBS test.
 * Fail if iconv isn't found.
 * Fix variable name for the ! subtitle-found case which was over-writing the audio variable.

Originally committed to SVN as r5154.
2011-01-09 01:37:34 +00:00
Amar Takhar 73bd4f2398 * Remove awk check -- we haven't need it in over a year.
* Remove check for iconv.m4, I switched to custom code over a year ago.

Originally committed to SVN as r5153.
2011-01-09 01:36:18 +00:00
Amar Takhar 23d96d071c Add missing property sheets to x64 build config.
Originally committed to SVN as r5152.
2011-01-09 00:47:06 +00:00
Niels Martin Hansen a13e0ddedf Clear out some warnings emitted by Visual C++ 2010.
On 32 bit VC 2010, std::streamsize is 64 bit while size_t is 32 bit.

Originally committed to SVN as r5151.
2011-01-08 21:58:48 +00:00
Niels Martin Hansen abf9ee645b std::basic_streambuf::_Sgetn_s was removed was Visual C++ 2010 for some reason.
Originally committed to SVN as r5150.
2011-01-08 21:54:31 +00:00
Karl Blomster 71928bc25b update ffms2 to r407
Originally committed to SVN as r5149.
2011-01-08 20:32:18 +00:00
Amar Takhar 8f401a838a Add utilities to a util:: namespace for clarity.
Originally committed to SVN as r5148.
2011-01-08 19:16:11 +00:00
Amar Takhar 68aa077add Actually add util.(c|h) which should have been in r5146.
Originally committed to SVN as r5147.
2011-01-08 19:14:48 +00:00
Amar Takhar 93f8b84688 * Instantiate log class.
* Create new util file and add a config_path() function to get Aegisubs' configuration directory.
 * Header cleanu

Originally committed to SVN as r5146.
2011-01-08 19:14:02 +00:00
Amar Takhar 3f110101aa Ensure the proper cflags are set for common/charset_conv.cpp in libaegisub. Also fix iconv include path on *bsd.
Originally committed to SVN as r5145.
2011-01-08 17:46:46 +00:00
Amar Takhar 69af40edc6 Fix compilation of linux support in the reporter.
Originally committed to SVN as r5144.
2011-01-08 15:38:30 +00:00
Amar Takhar 55803684c3 Use -Wl for linker flags.
Originally committed to SVN as r5143.
2011-01-08 15:38:11 +00:00
Amar Takhar 4eeacb5ab9 Silence warning.
Originally committed to SVN as r5142.
2011-01-08 15:25:04 +00:00
Amar Takhar c67fe6db5d Re-add platform-specific headers and fix prototypes.
Originally committed to SVN as r5141.
2011-01-08 15:24:35 +00:00
Amar Takhar 9d5a2b41b5 Add missing headers and sort.
Originally committed to SVN as r5140.
2011-01-08 15:18:58 +00:00
Amar Takhar ef76d4b91b Remove debug printf.
Originally committed to SVN as r5139.
2011-01-08 15:17:11 +00:00
Amar Takhar 7155e550ad Update for change of paths.
Originally committed to SVN as r5138.
2011-01-08 14:22:23 +00:00
Amar Takhar 1530115458 Add libaegisub to solution.
Originally committed to SVN as r5137.
2011-01-08 14:22:12 +00:00
Amar Takhar 319ac2d4bb Catch all exceptions when deciding whether to load the default config.
Originally committed to SVN as r5136.
2011-01-08 12:13:24 +00:00
Amar Takhar 0d7b2c6e76 Add missing headers when not using precompiled header support. Some minor formatting in libaegisub/common/hotkey.cpp.
Originally committed to SVN as r5135.
2011-01-08 12:10:40 +00:00
Amar Takhar c95d92c2ca Add a temp conditional to avoid exceptions when a command doesn't exist since the hotkeys aren't fully converted.
Originally committed to SVN as r5134.
2011-01-06 15:33:55 +00:00
Thomas Goyne b56b641122 MSVC hurfs a blurf when two files in the same project have the same name
Originally committed to SVN as r5133.
2011-01-05 18:40:46 +00:00
Thomas Goyne e450cb3e7e Fix include paths
Originally committed to SVN as r5132.
2011-01-05 18:40:37 +00:00
Thomas Goyne c6b65d8b82 Remove deleted files from the projects and add the new files
Originally committed to SVN as r5131.
2011-01-05 18:40:30 +00:00
Thomas Goyne 813aab2473 Add default_hotkey.json, default_menu.json, default_path.json, and default_toolbar.json to respack's post-build event.
Originally committed to SVN as r5130.
2011-01-05 18:40:24 +00:00
Amar Takhar 1ac31c65bf Remove medusa commands, they don't technically exist anymore as we call it "global timing mode" now.
Originally committed to SVN as r5129.
2011-01-05 14:19:11 +00:00
Amar Takhar 2804e0cb52 Actually trigger a hotkey if it exists.
Originally committed to SVN as r5128.
2011-01-05 14:07:23 +00:00
Amar Takhar 9915fb1c3b Add a depedency for libresrc on the 'command' subdir to ensure it's built first.
Originally committed to SVN as r5127.
2011-01-05 13:36:13 +00:00
Amar Takhar 167f09a610 Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258.
Originally committed to SVN as r5126.
2011-01-05 13:00:46 +00:00
Amar Takhar cdc73b17d2 Add support for bitmask options to Options. First one is to avoid flushing the config to disk which we don't want to happen when the reporter uses Options to read config values.
Originally committed to SVN as r5123.
2011-01-04 04:24:40 +00:00
Amar Takhar 010f3c14e5 Fix reading of aegisub config values.
Originally committed to SVN as r5122.
2011-01-04 04:23:51 +00:00
Amar Takhar a0e760c9da Replace all instances of wxString with std::string where possible.
Originally committed to SVN as r5121.
2011-01-04 00:22:55 +00:00
Amar Takhar 4d3c89eebf Cache wxGL* values to speed up GL probes, also delete locale in ~Platform().
Originally committed to SVN as r5120.
2011-01-03 16:14:43 +00:00
Amar Takhar 99aff7254f * wxString is really annoying.
* Build JSON tree.

Originally committed to SVN as r5119.
2011-01-03 15:46:21 +00:00
Amar Takhar c041bb8884 * Remove all vestiges of XML.
* Generate the report in the constructor.

Originally committed to SVN as r5118.
2011-01-03 14:28:24 +00:00
Amar Takhar 22c797a5d1 Fix some longstanding bugs now that I understand wxWidgets better.
Originally committed to SVN as r5116.
2011-01-03 14:11:53 +00:00
Amar Takhar f04d721228 Remove the name map, it's no longer required.
Originally committed to SVN as r5115.
2011-01-03 13:43:39 +00:00
Amar Takhar 7514812a25 Convert rest of the values to JSON.
Originally committed to SVN as r5114.
2011-01-03 13:33:53 +00:00