From fb3431df66d261af472980a607b4a112eb8dcbfe Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 25 Jul 2009 09:35:44 +0000 Subject: [PATCH] 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. --- aegisub/Makefile.am | 17 ++--- aegisub/configure.in | 3 +- aegisub/src/libresrc/Makefile.am | 9 ++- aegisub/src/libresrc/libresrc.h | 122 ------------------------------- aegisub/src/libresrc/resrc.cpp | 121 ------------------------------ aegisub/tools/Makefile.am | 11 +++ 6 files changed, 24 insertions(+), 259 deletions(-) delete mode 100644 aegisub/src/libresrc/libresrc.h delete mode 100644 aegisub/src/libresrc/resrc.cpp create mode 100644 aegisub/tools/Makefile.am diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index a6cee4a6b..6d0982cd7 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -14,13 +14,14 @@ ffmpegsource = libffms endif SUBDIRS = \ - $(univchardet) \ - $(libass) \ $(ffmpegsource) \ + $(libass) \ + $(univchardet) \ + tools \ src \ automation \ - po \ - desktop + desktop \ + po osx-bundle: @SHELL@ tools/osx-bundle.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) @@ -60,14 +61,6 @@ EXTRA_DIST += \ m4macros/ax_check_gl.m4 \ m4macros/ac_flag.m4 -# tools/ -EXTRA_DIST += \ - tools/osx-bundle-restart-helper.c \ - tools/osx-bundle.sh \ - tools/osx-dmg-dsstore.pl \ - tools/osx-dmg.sh \ - tools/osx-fix-libs.py - # packages/osx_bundle/ EXTRA_DIST += \ packages/osx_bundle/Contents/Info.plist \ diff --git a/aegisub/configure.in b/aegisub/configure.in index 10c2fdd81..393ad689d 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -1092,12 +1092,13 @@ libass/Makefile automation/Makefile po/Makefile.in desktop/Makefile +tools/Makefile ]) # Files that need substitution. AC_CONFIG_FILES([ desktop/aegisub.desktop -scripts/osx-bundle.sed +tools/osx-bundle.sed ]) AC_OUTPUT diff --git a/aegisub/src/libresrc/Makefile.am b/aegisub/src/libresrc/Makefile.am index 91412a643..618a000d2 100644 --- a/aegisub/src/libresrc/Makefile.am +++ b/aegisub/src/libresrc/Makefile.am @@ -1,7 +1,10 @@ noinst_LIBRARIES = libresrc.a -nodist_libresrc_a_SOURCES = resrc.cpp -noinst_HEADERS = libresrc.h + +nodist_libresrc_a_SOURCES = libresrc.cpp +libresrc_a_CPPFLAGS = @WX_CPPFLAGS@ EXTRA_DIST = \ - resrc.cpp \ wxicon_xpm.xpm + +libresrc.cpp: ../../tools/common-respack + ../../tools/common-respack libresrc.cpp ../bitmaps/16/* ../bitmaps/24/* diff --git a/aegisub/src/libresrc/libresrc.h b/aegisub/src/libresrc/libresrc.h deleted file mode 100644 index 26d126b55..000000000 --- a/aegisub/src/libresrc/libresrc.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef _RES_H -#define _RES_H -extern const char *wxicon_xpm[]; -extern const char *shift_times_toolbutton_xpm[]; -extern const char *button_track_movement_xpm[]; -extern const char *video_to_substart_xpm[]; -extern const char *null_button_xpm[]; -extern const char *sort_times_button_xpm[]; -extern const char *kanji_timer_button_xpm[]; -extern const char *button_underline_xpm[]; -extern const char *arrow_down_xpm[]; -extern const char *automation_toolbutton_xpm[]; -extern const char *button_bold_xpm[]; -extern const char *exit_button_xpm[]; -extern const char *snap_subs_to_scene_xpm[]; -extern const char *button_leadin_xpm[]; -extern const char *splash_xpm[]; -extern const char *forums_button_xpm[]; -extern const char *visual_move_xpm[]; -extern const char *styling_toolbutton_xpm[]; -extern const char *visual_rotatexy_xpm[]; -extern const char *button_track_points_xpm[]; -extern const char *visual_vector_clip_freehand_xpm[]; -extern const char *button_playline_xpm[]; -extern const char *arrow_up_stop_xpm[]; -extern const char *button_audio_goto_xpm[]; -extern const char *visual_clip_xpm[]; -extern const char *jumpto_button_xpm[]; -extern const char *toggle_audio_autocommit_xpm[]; -extern const char *subend_to_video_xpm[]; -extern const char *toggle_audio_medusa_xpm[]; -extern const char *style_toolbutton_xpm[]; -extern const char *select_visible_button_xpm[]; -extern const char *button_color_two_xpm[]; -extern const char *button_leadout_xpm[]; -extern const char *properties_toolbutton_xpm[]; -extern const char *visual_vector_clip_bicubic_xpm[]; -extern const char *button_pause_xpm[]; -extern const char *redo_button_xpm[]; -extern const char *zoom_out_button_xpm[]; -extern const char *spellcheck_toolbutton_xpm[]; -extern const char *visual_vector_clip_insert_xpm[]; -extern const char *button_track_point_del_xpm[]; -extern const char *resample_toolbutton_xpm[]; -extern const char *visual_standard_xpm[]; -extern const char *button_color_three_xpm[]; -extern const char *shift_to_frame_xpm[]; -extern const char *cut_button_xpm[]; -extern const char *find_next_button_xpm[]; -extern const char *select_lines_button_xpm[]; -extern const char *button_italics_xpm[]; -extern const char *visual_vector_clip_freehand_smooth_xpm[]; -extern const char *button_next_xpm[]; -extern const char *arrow_up_xpm[]; -extern const char *button_play_xpm[]; -extern const char *button_track_split_line_xpm[]; -extern const char *font_collector_button_xpm[]; -extern const char *toggle_audio_spectrum_xpm[]; -extern const char *website_button_xpm[]; -extern const char *button_playsel_xpm[]; -extern const char *timing_processor_toolbutton_xpm[]; -extern const char *button_playfivehbefore_xpm[]; -extern const char *bugtracker_button_xpm[]; -extern const char *visual_rotatez_xpm[]; -extern const char *save_as_toolbutton_xpm[]; -extern const char *button_playtoend_xpm[]; -extern const char *copy_button_xpm[]; -extern const char *visual_vector_clip_remove_xpm[]; -extern const char *visual_vector_clip_drag_xpm[]; -extern const char *toggle_audio_link_xpm[]; -extern const char *irc_button_xpm[]; -extern const char *translation_toolbutton_xpm[]; -extern const char *arrow_down_stop_xpm[]; -extern const char *paste_over_button_xpm[]; -extern const char *substart_to_video_xpm[]; -extern const char *about_button_xpm[]; -extern const char *toggle_tag_hiding_xpm[]; -extern const char *button_strikeout_xpm[]; -extern const char *find_button_xpm[]; -extern const char *button_track_move_xpm[]; -extern const char *arrow_sort_xpm[]; -extern const char *blank_button_xpm[]; -extern const char *button_track_trail_xpm[]; -extern const char *button_audio_commit_xpm[]; -extern const char *delete_button_xpm[]; -extern const char *button_fontname_xpm[]; -extern const char *new_toolbutton_xpm[]; -extern const char *options_button_xpm[]; -extern const char *undo_button_xpm[]; -extern const char *toggle_audio_ssa_xpm[]; -extern const char *visual_vector_clip_xpm[]; -extern const char *contents_button_xpm[]; -extern const char *button_playlastfiveh_xpm[]; -extern const char *hotkeys_button_xpm[]; -extern const char *visual_scale_xpm[]; -extern const char *open_with_toolbutton_xpm[]; -extern const char *zoom_in_button_xpm[]; -extern const char *visual_vector_clip_convert_xpm[]; -extern const char *button_track_point_add_xpm[]; -extern const char *toggle_video_autoscroll_xpm[]; -extern const char *replace_button_xpm[]; -extern const char *visual_move_conv_move_xpm[]; -extern const char *eyedropper_tool_xpm[]; -extern const char *visual_realtime_xpm[]; -extern const char *button_color_one_xpm[]; -extern const char *paste_button_xpm[]; -extern const char *open_toolbutton_xpm[]; -extern const char *visual_help_xpm[]; -extern const char *toggle_audio_nextcommit_xpm[]; -extern const char *button_stop_xpm[]; -extern const char *button_prev_xpm[]; -extern const char *toggle_audio_autoscroll_xpm[]; -extern const char *video_to_subend_xpm[]; -extern const char *visual_move_conv_pos_xpm[]; -extern const char *attach_button_xpm[]; -extern const char *save_toolbutton_xpm[]; -extern const char *assdraw_xpm[]; -extern const char *visual_vector_clip_line_xpm[]; -extern const char *button_color_four_xpm[]; -extern const char *button_playfirstfiveh_xpm[]; -extern const char *button_playfivehafter_xpm[]; -#endif /* _RES_H */ diff --git a/aegisub/src/libresrc/resrc.cpp b/aegisub/src/libresrc/resrc.cpp deleted file mode 100644 index 730f95822..000000000 --- a/aegisub/src/libresrc/resrc.cpp +++ /dev/null @@ -1,121 +0,0 @@ -#define static -#include "libresrc.h" -#include "wxicon_xpm.xpm" -#include "../bitmaps/shift_times_toolbutton_xpm.xpm" -#include "../bitmaps/button_track_movement_xpm.xpm" -#include "../bitmaps/video_to_substart_xpm.xpm" -#include "../bitmaps/null_button_xpm.xpm" -#include "../bitmaps/sort_times_button_xpm.xpm" -#include "../bitmaps/kanji_timer_button_xpm.xpm" -#include "../bitmaps/button_underline_xpm.xpm" -#include "../bitmaps/arrow_down_xpm.xpm" -#include "../bitmaps/automation_toolbutton_xpm.xpm" -#include "../bitmaps/button_bold_xpm.xpm" -#include "../bitmaps/exit_button_xpm.xpm" -#include "../bitmaps/snap_subs_to_scene_xpm.xpm" -#include "../bitmaps/button_leadin_xpm.xpm" -#include "../bitmaps/splash_xpm.xpm" -#include "../bitmaps/forums_button_xpm.xpm" -#include "../bitmaps/visual_move_xpm.xpm" -#include "../bitmaps/styling_toolbutton_xpm.xpm" -#include "../bitmaps/visual_rotatexy_xpm.xpm" -#include "../bitmaps/button_track_points_xpm.xpm" -#include "../bitmaps/visual_vector_clip_freehand_xpm.xpm" -#include "../bitmaps/button_playline_xpm.xpm" -#include "../bitmaps/arrow_up_stop_xpm.xpm" -#include "../bitmaps/button_audio_goto_xpm.xpm" -#include "../bitmaps/visual_clip_xpm.xpm" -#include "../bitmaps/jumpto_button_xpm.xpm" -#include "../bitmaps/toggle_audio_autocommit_xpm.xpm" -#include "../bitmaps/subend_to_video_xpm.xpm" -#include "../bitmaps/toggle_audio_medusa_xpm.xpm" -#include "../bitmaps/style_toolbutton_xpm.xpm" -#include "../bitmaps/select_visible_button_xpm.xpm" -#include "../bitmaps/button_color_two_xpm.xpm" -#include "../bitmaps/button_leadout_xpm.xpm" -#include "../bitmaps/properties_toolbutton_xpm.xpm" -#include "../bitmaps/visual_vector_clip_bicubic_xpm.xpm" -#include "../bitmaps/button_pause_xpm.xpm" -#include "../bitmaps/redo_button_xpm.xpm" -#include "../bitmaps/zoom_out_button_xpm.xpm" -#include "../bitmaps/spellcheck_toolbutton_xpm.xpm" -#include "../bitmaps/visual_vector_clip_insert_xpm.xpm" -#include "../bitmaps/button_track_point_del_xpm.xpm" -#include "../bitmaps/resample_toolbutton_xpm.xpm" -#include "../bitmaps/visual_standard_xpm.xpm" -#include "../bitmaps/button_color_three_xpm.xpm" -#include "../bitmaps/shift_to_frame_xpm.xpm" -#include "../bitmaps/cut_button_xpm.xpm" -#include "../bitmaps/find_next_button_xpm.xpm" -#include "../bitmaps/select_lines_button_xpm.xpm" -#include "../bitmaps/button_italics_xpm.xpm" -#include "../bitmaps/visual_vector_clip_freehand_smooth_xpm.xpm" -#include "../bitmaps/button_next_xpm.xpm" -#include "../bitmaps/arrow_up_xpm.xpm" -#include "../bitmaps/button_play_xpm.xpm" -#include "../bitmaps/button_track_split_line_xpm.xpm" -#include "../bitmaps/font_collector_button_xpm.xpm" -#include "../bitmaps/toggle_audio_spectrum_xpm.xpm" -#include "../bitmaps/website_button_xpm.xpm" -#include "../bitmaps/button_playsel_xpm.xpm" -#include "../bitmaps/timing_processor_toolbutton_xpm.xpm" -#include "../bitmaps/button_playfivehbefore_xpm.xpm" -#include "../bitmaps/bugtracker_button_xpm.xpm" -#include "../bitmaps/visual_rotatez_xpm.xpm" -#include "../bitmaps/save_as_toolbutton_xpm.xpm" -#include "../bitmaps/button_playtoend_xpm.xpm" -#include "../bitmaps/copy_button_xpm.xpm" -#include "../bitmaps/visual_vector_clip_remove_xpm.xpm" -#include "../bitmaps/visual_vector_clip_drag_xpm.xpm" -#include "../bitmaps/toggle_audio_link_xpm.xpm" -#include "../bitmaps/irc_button_xpm.xpm" -#include "../bitmaps/translation_toolbutton_xpm.xpm" -#include "../bitmaps/arrow_down_stop_xpm.xpm" -#include "../bitmaps/paste_over_button_xpm.xpm" -#include "../bitmaps/substart_to_video_xpm.xpm" -#include "../bitmaps/about_button_xpm.xpm" -#include "../bitmaps/toggle_tag_hiding_xpm.xpm" -#include "../bitmaps/button_strikeout_xpm.xpm" -#include "../bitmaps/find_button_xpm.xpm" -#include "../bitmaps/button_track_move_xpm.xpm" -#include "../bitmaps/arrow_sort_xpm.xpm" -#include "../bitmaps/blank_button_xpm.xpm" -#include "../bitmaps/button_track_trail_xpm.xpm" -#include "../bitmaps/button_audio_commit_xpm.xpm" -#include "../bitmaps/delete_button_xpm.xpm" -#include "../bitmaps/button_fontname_xpm.xpm" -#include "../bitmaps/new_toolbutton_xpm.xpm" -#include "../bitmaps/options_button_xpm.xpm" -#include "../bitmaps/undo_button_xpm.xpm" -#include "../bitmaps/toggle_audio_ssa_xpm.xpm" -#include "../bitmaps/visual_vector_clip_xpm.xpm" -#include "../bitmaps/contents_button_xpm.xpm" -#include "../bitmaps/button_playlastfiveh_xpm.xpm" -#include "../bitmaps/hotkeys_button_xpm.xpm" -#include "../bitmaps/visual_scale_xpm.xpm" -#include "../bitmaps/open_with_toolbutton_xpm.xpm" -#include "../bitmaps/zoom_in_button_xpm.xpm" -#include "../bitmaps/visual_vector_clip_convert_xpm.xpm" -#include "../bitmaps/button_track_point_add_xpm.xpm" -#include "../bitmaps/toggle_video_autoscroll_xpm.xpm" -#include "../bitmaps/replace_button_xpm.xpm" -#include "../bitmaps/visual_move_conv_move_xpm.xpm" -#include "../bitmaps/eyedropper_tool_xpm.xpm" -#include "../bitmaps/visual_realtime_xpm.xpm" -#include "../bitmaps/button_color_one_xpm.xpm" -#include "../bitmaps/paste_button_xpm.xpm" -#include "../bitmaps/open_toolbutton_xpm.xpm" -#include "../bitmaps/visual_help_xpm.xpm" -#include "../bitmaps/toggle_audio_nextcommit_xpm.xpm" -#include "../bitmaps/button_stop_xpm.xpm" -#include "../bitmaps/button_prev_xpm.xpm" -#include "../bitmaps/toggle_audio_autoscroll_xpm.xpm" -#include "../bitmaps/video_to_subend_xpm.xpm" -#include "../bitmaps/visual_move_conv_pos_xpm.xpm" -#include "../bitmaps/attach_button_xpm.xpm" -#include "../bitmaps/save_toolbutton_xpm.xpm" -#include "../bitmaps/assdraw_xpm.xpm" -#include "../bitmaps/visual_vector_clip_line_xpm.xpm" -#include "../bitmaps/button_color_four_xpm.xpm" -#include "../bitmaps/button_playfirstfiveh_xpm.xpm" -#include "../bitmaps/button_playfivehafter_xpm.xpm" diff --git a/aegisub/tools/Makefile.am b/aegisub/tools/Makefile.am new file mode 100644 index 000000000..9bf61ed6d --- /dev/null +++ b/aegisub/tools/Makefile.am @@ -0,0 +1,11 @@ +bin_PROGRAMS = common-respack +common_respack_CPPFLAGS = @WX_CPPFLAGS@ +common_respack_LDFLAGS = @WX_LIBS@ +common_respack_SOURCES = common-respack.cpp + +EXTRA_DIST = \ + osx-bundle-restart-helper.c \ + osx-bundle.sh \ + osx-dmg-dsstore.pl \ + osx-dmg.sh \ + osx-fix-libs.py