mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Mostly fix unix build issues related to the new image embedding.

Browse source 
Originally committed to SVN as r3276.
This commit is contained in:
Thomas Goyne 2009-07-25 18:08:17 +00:00
parent 966f88e577
commit 01505e3d37
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/libresrc/Makefile.am
View file

@ -7,4 +7,4 @@ EXTRA_DIST = \
wxicon_xpm.xpm wxicon_xpm.xpm
libresrc.cpp: ../../tools/common-respack libresrc.cpp: ../../tools/common-respack
../../tools/common-respack libresrc.cpp ../bitmaps/16/* ../bitmaps/24/* ../../tools/common-respack libresrc.cpp ../bitmaps/16 ../bitmaps/24 ../bitmaps/misc/splash.png

20
aegisub/tools/common-respack.cpp
View file

@ -113,14 +113,20 @@ int main(int argc, const char *argv[]) {
ofstream outH(headerFileName.GetFullPath().char_str()); ofstream outH(headerFileName.GetFullPath().char_str());
ofstream outC(argv[1]); ofstream outC(argv[1]);
outC << "/* This is an automatically generated file and should not be modified directly */" << endl; outC << "/* This is an automatically generated file and should not be modified directly */" << endl
outC << "#include \"" << headerFileName.GetFullName() << "\"" << endl; << "#include \"" << headerFileName.GetFullName() << "\"" << endl
<< "wxBitmap " << headerFileName.GetName() << "_getimage(const unsigned char *buff, size_t size) {" << endl
<< " wxMemoryInputStream mem(buff, size);" << endl
<< " wxImage image(mem);" << endl
<< " return wxBitmap(image);" << endl
<< "}" << endl;
outH << "/* This is an automatically generated file and should not be modified directly */" << endl; outH << "/* This is an automatically generated file and should not be modified directly */" << endl
outH << "#include <wx/mstream.h>" << endl; << "#include <wx/mstream.h>" << endl
outH << "#include <wx/bitmap.h>" << endl; << "#include <wx/bitmap.h>" << endl
outH << "#include <wx/image.h>" << endl; << "#include <wx/image.h>" << endl
outH << "#define GETIMAGE(a) wxBitmap(wxImage(wxMemoryInputStream(a, sizeof(a))))" << endl; << "wxBitmap " << headerFileName.GetName() << "_getimage(const unsigned char *image, size_t size);" << endl
<< "#define GETIMAGE(a) " << headerFileName.GetName() << "_getimage(a, sizeof(a))" << endl;
wxRegEx nameCleaner("[^A-Za-z_0-9]"); wxRegEx nameCleaner("[^A-Za-z_0-9]");
wxString filename; wxString filename;