Commit graph

27 commits

Author SHA1 Message Date
Thomas Goyne 5338a60cdb Fix compilation errors when not using precompiled headers
Originally committed to SVN as r4511.
2010-06-14 19:26:27 +00:00
Thomas Goyne 8c8e668758 Only include libresrc.h once rather than once per file packed
Originally committed to SVN as r4475.
2010-06-11 02:25:18 +00:00
Amar Takhar 810ffa09c7 Convert the identifier to an std::string from wxString. For whatever reason wxString is producing addresses rather than strings when automatically converting. I've seen this behaviour before and it seems quite random. This will solve that problem.
Originally committed to SVN as r4342.
2010-05-22 01:22:53 +00:00
Amar Takhar 40e12403d5 Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format.
Initial support for low-level access and file I/O methods are included as well.

Originally committed to SVN as r4331.
2010-05-21 01:13:36 +00:00
Amar Takhar f002850e17 Fix distfile creation.
Originally committed to SVN as r4260.
2010-05-06 16:05:34 +00:00
Kevin Ollivier aa417cf903 Remove unintentionally added tabs.
Originally committed to SVN as r4174.
2010-03-13 18:16:40 +00:00
Kevin Ollivier 277f1959ad We should still increment currentItem when the file and dir tests both return false, as otherwise we get into infinite recursion processing the same item.
Originally committed to SVN as r4172.
2010-03-13 17:43:47 +00:00
Thomas Goyne 409bcc561a Update the windows build system to work with the changes made in r4169.
Originally committed to SVN as r4170.
2010-03-03 01:28:47 +00:00
Amar Takhar c3c14b0815 Change how libresrc is built:
* Instead of putting code into the .(c|h) files place it into two new files libresrc.(c|h)
 * Bitmaps now go into bitmaps.(c|h)
 * Default configs into default_config.(c|h)

With this approach we can easily embed any resources by simply calling it with common-respack and not having to do anything else.

Originally committed to SVN as r4169.
2010-03-03 00:44:17 +00:00
Amar Takhar 4a42ab1403 merge r4011,r4012 (Switch from Mac::Finder::DSStore to using AppleScript)
Originally committed to SVN as r4025.
2010-01-21 00:37:04 +00:00
Amar Takhar 89e2428dbe merge r3992 (restart-helper fixes)
Originally committed to SVN as r4020.
2010-01-21 00:26:45 +00:00
Amar Takhar 361f5228ba Merge r3977 (osx-fix-libs) from 2.1.8 closes #964.
Originally committed to SVN as r3978.
2010-01-12 13:00:24 +00:00
Kevin Ollivier dd0da6744b Commit of start on waf build system. Uses the most recent waf release. Currently builds on OS X with ffmpeg, OpenAL and libass providers, do waf configure; waf build to build.
Originally committed to SVN as r3854.
2009-12-07 00:42:51 +00:00
Amar Takhar c494b694a0 Disable setting of .DS_Store for now.
Originally committed to SVN as r3482.
2009-09-04 02:38:30 +00:00
Amar Takhar 99f421bf73 Set the .DS_Store file in the temp dmg directory rather than after it's mounted. jfs reported finder crashing after updating to 10.5.8. Setting it this way should work and avoid the issue of .DS_Store changing randomly as a folder won't show up on the desktop like a mounted image will.
Originally committed to SVN as r3481.
2009-09-04 02:16:39 +00:00
Amar Takhar 7634ce2d4e Add -force to 'hdiutil detach'.. this should stop the "Resource Busy" errors we keep on getting. I should have un-lazy'd myself a long time ago, though if I knew the fix this was this simple I would have.. guess I'm too used to every fix on OS X being long and convoluted. (argh)
Originally committed to SVN as r3401.
2009-08-13 19:35:42 +00:00
Amar Takhar bb4207b380 It's tools/ now now scripts/ (should fix osx dmging.)
Originally committed to SVN as r3397.
2009-08-13 01:12:00 +00:00
Amar Takhar d8200c669e Add some logic to copy files as links if they're links, and resolve all links to the final destination file then copy that. This is just part of the solution. The final solution will be to remove all symbolic links and change all library references (to symbolic links) to their actual versioned filename. Updates #964
Originally committed to SVN as r3342.
2009-07-31 23:47:22 +00:00
Amar Takhar 127a39626b * Build the restart-helper program in a makefile rather than in osx-bundle.sh
* Update paths to use tools/ instead of scripts/ in osx-bundle.sh

Originally committed to SVN as r3337.
2009-07-31 20:29:29 +00:00
Thomas Goyne 01505e3d37 Mostly fix unix build issues related to the new image embedding.
Originally committed to SVN as r3276.
2009-07-25 18:08:17 +00:00
Niels Martin Hansen 966f88e577 Move a bunch of project properties for respack into VSProps files:
* Support picking up wx from $solution/wxlib/ location
 * Use standard_outdirs
 * Move post-build resource-packing event into new VSProps

Originally committed to SVN as r3275.
2009-07-25 17:13:10 +00:00
Thomas Goyne e6d6a056c9 Change resources filename back to libresrc.cpp/h.
Originally committed to SVN as r3272.
2009-07-25 16:15:13 +00:00
Amar Takhar fb3431df66 Commit changes to support importing bitmaps as character strings, this is still broken however the final fix should be quite simple.
Originally committed to SVN as r3270.
2009-07-25 09:35:44 +00:00
Amar Takhar ffe628f29a Move tellg() usage to the start of the block rather than at the end, otherwise it would always return -1. This should be harmless for windows.
Originally committed to SVN as r3269.
2009-07-25 08:32:21 +00:00
Amar Takhar 2522102465 Change .wc_str() to .char_str() to fix unix build breakage, should be fine on windows..
Originally committed to SVN as r3268.
2009-07-25 08:01:30 +00:00
Thomas Goyne c641c6e656 Switch all icons in Aegisub to use the new png versions, using a new small tool to store the pngs as byte arrays in a cpp file.
Originally committed to SVN as r3265.
2009-07-25 04:49:59 +00:00
Amar Takhar 4a757421d9 Rename scripts/ to tools/ as it makes more sense, initially the directory only contained scripts however with the addition of our 3rd tool it makes sense to just rename the entire direectory. Keeping the old scripts/ dir around was just extra clutter and would probably cause confusion as to which place a new script/tool should go.
Originally committed to SVN as r3260.
2009-07-25 02:29:04 +00:00