iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Amar Takhar 2009-07-25 09:35:44 +00:00
parent ffe628f29a
commit fb3431df66
6 changed files with 24 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aegisub/Makefile.am
View File

@ -14,13 +14,14 @@ ffmpegsource = libffms
endif endif
SUBDIRS = \ SUBDIRS = \
$(univchardet) \
$(libass) \
$(ffmpegsource) \ $(ffmpegsource) \
$(libass) \
$(univchardet) \
tools \
src \ src \
automation \ automation \
po \ desktop \
desktop po
osx-bundle: osx-bundle:
@SHELL@ tools/osx-bundle.sh "Aegisub (r@SVN_REVISION@-@DARWIN_ARCH@@PACKAGE_DEBUG@)" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR) @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/ax_check_gl.m4 \
m4macros/ac_flag.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/ # packages/osx_bundle/
EXTRA_DIST += \ EXTRA_DIST += \
packages/osx_bundle/Contents/Info.plist \ packages/osx_bundle/Contents/Info.plist \

3
aegisub/configure.in
View File

@ -1092,12 +1092,13 @@ libass/Makefile
automation/Makefile automation/Makefile
po/Makefile.in po/Makefile.in
desktop/Makefile desktop/Makefile
tools/Makefile
]) ])
# Files that need substitution. # Files that need substitution.
AC_CONFIG_FILES([ AC_CONFIG_FILES([
desktop/aegisub.desktop desktop/aegisub.desktop
scripts/osx-bundle.sed tools/osx-bundle.sed
]) ])
AC_OUTPUT AC_OUTPUT

9
aegisub/src/libresrc/Makefile.am
View File

@ -1,7 +1,10 @@
noinst_LIBRARIES = libresrc.a 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 = \ EXTRA_DIST = \
resrc.cpp \
wxicon_xpm.xpm wxicon_xpm.xpm
libresrc.cpp: ../../tools/common-respack
../../tools/common-respack libresrc.cpp ../bitmaps/16/* ../bitmaps/24/*

122
aegisub/src/libresrc/libresrc.h
View File

@ -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 */

121
aegisub/src/libresrc/resrc.cpp
View File

@ -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"

11
aegisub/tools/Makefile.am Normal file
View File

@ -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