mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-28 16:20:50 +00:00
Modified makefile.lst for cpp files.
Renamed src/test to src/tests.
This commit is contained in:
David Capello
parent
a587132ffe
commit
1e44f9a454
@ -1,3 +1,9 @@
|
||||
2008-09-30 David A. Capello <davidcapello@gmail.com>
|
||||
|
||||
* src/tests/: Renamed src/test to src/tests
|
||||
|
||||
* makefile.lst: Project converted to C++
|
||||
|
||||
2008-09-29 David A. Capello <davidcapello@gmail.com>
|
||||
|
||||
* src/widgets/fileview.c (fileview_msg_proc): Fixed a bug when the
|
||||
|
||||
10
makefile.gcc
10
makefile.gcc
@ -165,18 +165,18 @@ endif
|
||||
######################################################################
|
||||
# Rules to make tests
|
||||
|
||||
src/test/%$(EXE): src/test/%.cpp $(COMMON_OBJS)
|
||||
src/tests/%$(EXE): src/tests/%.cpp $(COMMON_OBJS)
|
||||
$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
|
||||
|
||||
src/test/raster/%$(EXE): src/test/raster/%.cpp $(COMMON_OBJS)
|
||||
src/tests/raster/%$(EXE): src/tests/raster/%.cpp $(COMMON_OBJS)
|
||||
$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
|
||||
|
||||
src/test/jinete/%$(EXE): src/test/jinete/%.cpp $(COMMON_OBJS)
|
||||
src/tests/jinete/%$(EXE): src/tests/jinete/%.cpp $(COMMON_OBJS)
|
||||
$(CPP) $(CFLAGS) -o $@ $^ $(LFLAGS) $(LFLAGS_LAST)
|
||||
|
||||
test: $(TESTS)
|
||||
tests: $(TESTS)
|
||||
|
||||
runtest: $(AUTOTESTS)
|
||||
runtests: $(AUTOTESTS)
|
||||
@-$(foreach TEST, $(AUTOTESTS), \
|
||||
echo ./$(TEST) "=====================" ; \
|
||||
./$(TEST) ; \
|
||||
|
||||
428
makefile.lst
428
makefile.lst
@ -6,215 +6,215 @@
|
||||
ASE = aseprite$(EXE)
|
||||
|
||||
COMMON_SOURCES = \
|
||||
src/commands/cmd_about.c \
|
||||
src/commands/cmd_advanced_mode.c \
|
||||
src/commands/cmd_background_from_layer.c \
|
||||
src/commands/cmd_cel_properties.c \
|
||||
src/commands/cmd_change_image_type.c \
|
||||
src/commands/cmd_clear.c \
|
||||
src/commands/cmd_close_file.c \
|
||||
src/commands/cmd_configure_screen.c \
|
||||
src/commands/cmd_configure_tools.c \
|
||||
src/commands/cmd_copy.c \
|
||||
src/commands/cmd_copy_cel.c \
|
||||
src/commands/cmd_crop.c \
|
||||
src/commands/cmd_cut.c \
|
||||
src/commands/cmd_deselect_mask.c \
|
||||
src/commands/cmd_draw_text.c \
|
||||
src/commands/cmd_drawing_tools.c \
|
||||
src/commands/cmd_duplicate_layer.c \
|
||||
src/commands/cmd_duplicate_sprite.c \
|
||||
src/commands/cmd_exit.c \
|
||||
src/commands/cmd_eyedropper_tool.c \
|
||||
src/commands/cmd_film_editor.c \
|
||||
src/commands/cmd_flatten_layers.c \
|
||||
src/commands/cmd_flip.c \
|
||||
src/commands/cmd_frame_properties.c \
|
||||
src/commands/cmd_goto_frame.c \
|
||||
src/commands/cmd_goto_layer.c \
|
||||
src/commands/cmd_grid.c \
|
||||
src/commands/cmd_invert_mask.c \
|
||||
src/commands/cmd_layer_from_background.c \
|
||||
src/commands/cmd_layer_properties.c \
|
||||
src/commands/cmd_load_mask.c \
|
||||
src/commands/cmd_mask_all.c \
|
||||
src/commands/cmd_mask_by_color.c \
|
||||
src/commands/cmd_merge_down_layer.c \
|
||||
src/commands/cmd_move_cel.c \
|
||||
src/commands/cmd_new_file.c \
|
||||
src/commands/cmd_new_frame.c \
|
||||
src/commands/cmd_new_layer.c \
|
||||
src/commands/cmd_new_layer_set.c \
|
||||
src/commands/cmd_open_file.c \
|
||||
src/commands/cmd_options.c \
|
||||
src/commands/cmd_palette_editor.c \
|
||||
src/commands/cmd_paste.c \
|
||||
src/commands/cmd_play_animation.c \
|
||||
src/commands/cmd_play_flic.c \
|
||||
src/commands/cmd_preview.c \
|
||||
src/commands/cmd_record_screen.c \
|
||||
src/commands/cmd_redo.c \
|
||||
src/commands/cmd_refresh.c \
|
||||
src/commands/cmd_remove_cel.c \
|
||||
src/commands/cmd_remove_frame.c \
|
||||
src/commands/cmd_remove_layer.c \
|
||||
src/commands/cmd_reselect_mask.c \
|
||||
src/commands/cmd_save_file.c \
|
||||
src/commands/cmd_save_mask.c \
|
||||
src/commands/cmd_screen_shot.c \
|
||||
src/commands/cmd_select_file.c \
|
||||
src/commands/cmd_sprite_editor.c \
|
||||
src/commands/cmd_sprite_properties.c \
|
||||
src/commands/cmd_switch_colors.c \
|
||||
src/commands/cmd_tips.c \
|
||||
src/commands/cmd_undo.c \
|
||||
src/commands/commands.c \
|
||||
src/commands/fx/cmd_color_curve.c \
|
||||
src/commands/fx/cmd_convolution_matrix.c \
|
||||
src/commands/fx/cmd_despeckle.c \
|
||||
src/commands/fx/cmd_invert_color.c \
|
||||
src/commands/fx/cmd_replace_color.c \
|
||||
src/commands/fx/effectbg.c \
|
||||
src/console/console.c \
|
||||
src/core/app.c \
|
||||
src/core/cfg.c \
|
||||
src/core/color.c \
|
||||
src/core/config.c \
|
||||
src/core/core.c \
|
||||
src/core/dirs.c \
|
||||
src/core/file_system.c \
|
||||
src/core/modules.c \
|
||||
src/dialogs/aniedit.c \
|
||||
src/dialogs/canvasze.c \
|
||||
src/dialogs/drawtext.c \
|
||||
src/dialogs/filesel.c \
|
||||
src/dialogs/maskcol.c \
|
||||
src/dialogs/options.c \
|
||||
src/dialogs/playfli.c \
|
||||
src/dialogs/repo.c \
|
||||
src/dialogs/tips.c \
|
||||
src/dialogs/vectmap.c \
|
||||
src/effect/colcurve.c \
|
||||
src/effect/convmatr.c \
|
||||
src/effect/effect.c \
|
||||
src/effect/invrtcol.c \
|
||||
src/effect/median.c \
|
||||
src/effect/replcol.c \
|
||||
src/file/ase_format.c \
|
||||
src/file/bmp_format.c \
|
||||
src/file/file.c \
|
||||
src/file/fli/fli.c \
|
||||
src/file/fli_format.c \
|
||||
src/file/format_options.c \
|
||||
src/file/gif/format.c \
|
||||
src/file/gif/lzw.c \
|
||||
src/file/gif_format.c \
|
||||
src/file/ico_format.c \
|
||||
src/file/jpeg_format.c \
|
||||
src/file/pcx_format.c \
|
||||
src/file/png_format.c \
|
||||
src/file/tga_format.c \
|
||||
src/intl/intl.c \
|
||||
src/intl/msgids.c \
|
||||
src/jinete/jaccel.c \
|
||||
src/jinete/jalert.c \
|
||||
src/jinete/jbox.c \
|
||||
src/jinete/jbutton.c \
|
||||
src/jinete/jclipboard.c \
|
||||
src/jinete/jcombobox.c \
|
||||
src/jinete/jdraw.c \
|
||||
src/jinete/jentry.c \
|
||||
src/jinete/jgrid.c \
|
||||
src/jinete/jfile.c \
|
||||
src/jinete/jfilesel.c \
|
||||
src/jinete/jfont.c \
|
||||
src/jinete/jfontbmp.c \
|
||||
src/jinete/jhook.c \
|
||||
src/jinete/jimage.c \
|
||||
src/jinete/jintern.c \
|
||||
src/jinete/jlabel.c \
|
||||
src/jinete/jlist.c \
|
||||
src/jinete/jlistbox.c \
|
||||
src/jinete/jmanager.c \
|
||||
src/jinete/jmem.c \
|
||||
src/jinete/jmenu.c \
|
||||
src/jinete/jmessage.c \
|
||||
src/jinete/jmutex.c \
|
||||
src/jinete/jpanel.c \
|
||||
src/jinete/jquickmenu.c \
|
||||
src/jinete/jrect.c \
|
||||
src/jinete/jregion.c \
|
||||
src/jinete/jsep.c \
|
||||
src/jinete/jslider.c \
|
||||
src/jinete/jstream.c \
|
||||
src/jinete/jsystem.c \
|
||||
src/jinete/jtextbox.c \
|
||||
src/jinete/jtheme.c \
|
||||
src/jinete/jthread.c \
|
||||
src/jinete/jtooltips.c \
|
||||
src/jinete/jview.c \
|
||||
src/jinete/jwidget.c \
|
||||
src/jinete/jwindow.c \
|
||||
src/jinete/jxml.c \
|
||||
src/jinete/themes/jstandard_theme.c \
|
||||
src/modules/editors.c \
|
||||
src/modules/gfx.c \
|
||||
src/modules/gui.c \
|
||||
src/modules/palettes.c \
|
||||
src/modules/recent.c \
|
||||
src/modules/rootmenu.c \
|
||||
src/modules/sprites.c \
|
||||
src/modules/tools.c \
|
||||
src/raster/algo.c \
|
||||
src/raster/algofill.c \
|
||||
src/raster/blend.c \
|
||||
src/raster/brush.c \
|
||||
src/raster/cel.c \
|
||||
src/raster/dirty.c \
|
||||
src/raster/gfxobj.c \
|
||||
src/raster/image.c \
|
||||
src/raster/layer.c \
|
||||
src/raster/mask.c \
|
||||
src/raster/palette.c \
|
||||
src/raster/path.c \
|
||||
src/raster/quant.c \
|
||||
src/raster/rotate.c \
|
||||
src/raster/sprite.c \
|
||||
src/raster/stock.c \
|
||||
src/raster/undo.c \
|
||||
src/util/autocrop.c \
|
||||
src/util/boundary.c \
|
||||
src/util/celmove.c \
|
||||
src/util/clipbrd.c \
|
||||
src/util/col_file.c \
|
||||
src/util/filetoks.c \
|
||||
src/util/functions.c \
|
||||
src/util/hash.c \
|
||||
src/util/misc.c \
|
||||
src/util/msk_file.c \
|
||||
src/util/pic_file.c \
|
||||
src/util/quantize.c \
|
||||
src/util/recscr.c \
|
||||
src/util/render.c \
|
||||
src/util/thmbnail.c \
|
||||
src/widgets/colbar.c \
|
||||
src/widgets/colbut.c \
|
||||
src/widgets/colsel.c \
|
||||
src/widgets/colview.c \
|
||||
src/widgets/curvedit.c \
|
||||
src/widgets/editor/click.c \
|
||||
src/widgets/editor/cursor.c \
|
||||
src/widgets/editor/editor.c \
|
||||
src/widgets/editor/keys.c \
|
||||
src/widgets/fileview.c \
|
||||
src/widgets/groupbut.c \
|
||||
src/widgets/menuitem.c \
|
||||
src/widgets/paledit.c \
|
||||
src/widgets/preview.c \
|
||||
src/widgets/statebar.c \
|
||||
src/widgets/tabs.c \
|
||||
src/widgets/target.c \
|
||||
src/widgets/toolbar.c
|
||||
src/commands/cmd_about.cpp \
|
||||
src/commands/cmd_advanced_mode.cpp \
|
||||
src/commands/cmd_background_from_layer.cpp \
|
||||
src/commands/cmd_cel_properties.cpp \
|
||||
src/commands/cmd_change_image_type.cpp \
|
||||
src/commands/cmd_clear.cpp \
|
||||
src/commands/cmd_close_file.cpp \
|
||||
src/commands/cmd_configure_screen.cpp \
|
||||
src/commands/cmd_configure_tools.cpp \
|
||||
src/commands/cmd_copy.cpp \
|
||||
src/commands/cmd_copy_cel.cpp \
|
||||
src/commands/cmd_crop.cpp \
|
||||
src/commands/cmd_cut.cpp \
|
||||
src/commands/cmd_deselect_mask.cpp \
|
||||
src/commands/cmd_draw_text.cpp \
|
||||
src/commands/cmd_drawing_tools.cpp \
|
||||
src/commands/cmd_duplicate_layer.cpp \
|
||||
src/commands/cmd_duplicate_sprite.cpp \
|
||||
src/commands/cmd_exit.cpp \
|
||||
src/commands/cmd_eyedropper_tool.cpp \
|
||||
src/commands/cmd_film_editor.cpp \
|
||||
src/commands/cmd_flatten_layers.cpp \
|
||||
src/commands/cmd_flip.cpp \
|
||||
src/commands/cmd_frame_properties.cpp \
|
||||
src/commands/cmd_goto_frame.cpp \
|
||||
src/commands/cmd_goto_layer.cpp \
|
||||
src/commands/cmd_grid.cpp \
|
||||
src/commands/cmd_invert_mask.cpp \
|
||||
src/commands/cmd_layer_from_background.cpp \
|
||||
src/commands/cmd_layer_properties.cpp \
|
||||
src/commands/cmd_load_mask.cpp \
|
||||
src/commands/cmd_mask_all.cpp \
|
||||
src/commands/cmd_mask_by_color.cpp \
|
||||
src/commands/cmd_merge_down_layer.cpp \
|
||||
src/commands/cmd_move_cel.cpp \
|
||||
src/commands/cmd_new_file.cpp \
|
||||
src/commands/cmd_new_frame.cpp \
|
||||
src/commands/cmd_new_layer.cpp \
|
||||
src/commands/cmd_new_layer_set.cpp \
|
||||
src/commands/cmd_open_file.cpp \
|
||||
src/commands/cmd_options.cpp \
|
||||
src/commands/cmd_palette_editor.cpp \
|
||||
src/commands/cmd_paste.cpp \
|
||||
src/commands/cmd_play_animation.cpp \
|
||||
src/commands/cmd_play_flic.cpp \
|
||||
src/commands/cmd_preview.cpp \
|
||||
src/commands/cmd_record_screen.cpp \
|
||||
src/commands/cmd_redo.cpp \
|
||||
src/commands/cmd_refresh.cpp \
|
||||
src/commands/cmd_remove_cel.cpp \
|
||||
src/commands/cmd_remove_frame.cpp \
|
||||
src/commands/cmd_remove_layer.cpp \
|
||||
src/commands/cmd_reselect_mask.cpp \
|
||||
src/commands/cmd_save_file.cpp \
|
||||
src/commands/cmd_save_mask.cpp \
|
||||
src/commands/cmd_screen_shot.cpp \
|
||||
src/commands/cmd_select_file.cpp \
|
||||
src/commands/cmd_sprite_editor.cpp \
|
||||
src/commands/cmd_sprite_properties.cpp \
|
||||
src/commands/cmd_switch_colors.cpp \
|
||||
src/commands/cmd_tips.cpp \
|
||||
src/commands/cmd_undo.cpp \
|
||||
src/commands/commands.cpp \
|
||||
src/commands/fx/cmd_color_curve.cpp \
|
||||
src/commands/fx/cmd_convolution_matrix.cpp \
|
||||
src/commands/fx/cmd_despeckle.cpp \
|
||||
src/commands/fx/cmd_invert_color.cpp \
|
||||
src/commands/fx/cmd_replace_color.cpp \
|
||||
src/commands/fx/effectbg.cpp \
|
||||
src/console/console.cpp \
|
||||
src/core/app.cpp \
|
||||
src/core/cfg.cpp \
|
||||
src/core/color.cpp \
|
||||
src/core/config.cpp \
|
||||
src/core/core.cpp \
|
||||
src/core/dirs.cpp \
|
||||
src/core/file_system.cpp \
|
||||
src/core/modules.cpp \
|
||||
src/dialogs/aniedit.cpp \
|
||||
src/dialogs/canvasze.cpp \
|
||||
src/dialogs/drawtext.cpp \
|
||||
src/dialogs/filesel.cpp \
|
||||
src/dialogs/maskcol.cpp \
|
||||
src/dialogs/options.cpp \
|
||||
src/dialogs/playfli.cpp \
|
||||
src/dialogs/repo.cpp \
|
||||
src/dialogs/tips.cpp \
|
||||
src/dialogs/vectmap.cpp \
|
||||
src/effect/colcurve.cpp \
|
||||
src/effect/convmatr.cpp \
|
||||
src/effect/effect.cpp \
|
||||
src/effect/invrtcol.cpp \
|
||||
src/effect/median.cpp \
|
||||
src/effect/replcol.cpp \
|
||||
src/file/ase_format.cpp \
|
||||
src/file/bmp_format.cpp \
|
||||
src/file/file.cpp \
|
||||
src/file/fli/fli.cpp \
|
||||
src/file/fli_format.cpp \
|
||||
src/file/format_options.cpp \
|
||||
src/file/gif/format.cpp \
|
||||
src/file/gif/lzw.cpp \
|
||||
src/file/gif_format.cpp \
|
||||
src/file/ico_format.cpp \
|
||||
src/file/jpeg_format.cpp \
|
||||
src/file/pcx_format.cpp \
|
||||
src/file/png_format.cpp \
|
||||
src/file/tga_format.cpp \
|
||||
src/intl/intl.cpp \
|
||||
src/intl/msgids.cpp \
|
||||
src/jinete/jaccel.cpp \
|
||||
src/jinete/jalert.cpp \
|
||||
src/jinete/jbox.cpp \
|
||||
src/jinete/jbutton.cpp \
|
||||
src/jinete/jclipboard.cpp \
|
||||
src/jinete/jcombobox.cpp \
|
||||
src/jinete/jdraw.cpp \
|
||||
src/jinete/jentry.cpp \
|
||||
src/jinete/jgrid.cpp \
|
||||
src/jinete/jfile.cpp \
|
||||
src/jinete/jfilesel.cpp \
|
||||
src/jinete/jfont.cpp \
|
||||
src/jinete/jfontbmp.cpp \
|
||||
src/jinete/jhook.cpp \
|
||||
src/jinete/jimage.cpp \
|
||||
src/jinete/jintern.cpp \
|
||||
src/jinete/jlabel.cpp \
|
||||
src/jinete/jlist.cpp \
|
||||
src/jinete/jlistbox.cpp \
|
||||
src/jinete/jmanager.cpp \
|
||||
src/jinete/jmem.cpp \
|
||||
src/jinete/jmenu.cpp \
|
||||
src/jinete/jmessage.cpp \
|
||||
src/jinete/jmutex.cpp \
|
||||
src/jinete/jpanel.cpp \
|
||||
src/jinete/jquickmenu.cpp \
|
||||
src/jinete/jrect.cpp \
|
||||
src/jinete/jregion.cpp \
|
||||
src/jinete/jsep.cpp \
|
||||
src/jinete/jslider.cpp \
|
||||
src/jinete/jstream.cpp \
|
||||
src/jinete/jsystem.cpp \
|
||||
src/jinete/jtextbox.cpp \
|
||||
src/jinete/jtheme.cpp \
|
||||
src/jinete/jthread.cpp \
|
||||
src/jinete/jtooltips.cpp \
|
||||
src/jinete/jview.cpp \
|
||||
src/jinete/jwidget.cpp \
|
||||
src/jinete/jwindow.cpp \
|
||||
src/jinete/jxml.cpp \
|
||||
src/jinete/themes/jstandard_theme.cpp \
|
||||
src/modules/editors.cpp \
|
||||
src/modules/gfx.cpp \
|
||||
src/modules/gui.cpp \
|
||||
src/modules/palettes.cpp \
|
||||
src/modules/recent.cpp \
|
||||
src/modules/rootmenu.cpp \
|
||||
src/modules/sprites.cpp \
|
||||
src/modules/tools.cpp \
|
||||
src/raster/algo.cpp \
|
||||
src/raster/algofill.cpp \
|
||||
src/raster/blend.cpp \
|
||||
src/raster/brush.cpp \
|
||||
src/raster/cel.cpp \
|
||||
src/raster/dirty.cpp \
|
||||
src/raster/gfxobj.cpp \
|
||||
src/raster/image.cpp \
|
||||
src/raster/layer.cpp \
|
||||
src/raster/mask.cpp \
|
||||
src/raster/palette.cpp \
|
||||
src/raster/path.cpp \
|
||||
src/raster/quant.cpp \
|
||||
src/raster/rotate.cpp \
|
||||
src/raster/sprite.cpp \
|
||||
src/raster/stock.cpp \
|
||||
src/raster/undo.cpp \
|
||||
src/util/autocrop.cpp \
|
||||
src/util/boundary.cpp \
|
||||
src/util/celmove.cpp \
|
||||
src/util/clipbrd.cpp \
|
||||
src/util/col_file.cpp \
|
||||
src/util/filetoks.cpp \
|
||||
src/util/functions.cpp \
|
||||
src/util/hash.cpp \
|
||||
src/util/misc.cpp \
|
||||
src/util/msk_file.cpp \
|
||||
src/util/pic_file.cpp \
|
||||
src/util/quantize.cpp \
|
||||
src/util/recscr.cpp \
|
||||
src/util/render.cpp \
|
||||
src/util/thmbnail.cpp \
|
||||
src/widgets/colbar.cpp \
|
||||
src/widgets/colbut.cpp \
|
||||
src/widgets/colsel.cpp \
|
||||
src/widgets/colview.cpp \
|
||||
src/widgets/curvedit.cpp \
|
||||
src/widgets/editor/click.cpp \
|
||||
src/widgets/editor/cursor.cpp \
|
||||
src/widgets/editor/editor.cpp \
|
||||
src/widgets/editor/keys.cpp \
|
||||
src/widgets/fileview.cpp \
|
||||
src/widgets/groupbut.cpp \
|
||||
src/widgets/menuitem.cpp \
|
||||
src/widgets/paledit.cpp \
|
||||
src/widgets/preview.cpp \
|
||||
src/widgets/statebar.cpp \
|
||||
src/widgets/tabs.cpp \
|
||||
src/widgets/target.cpp \
|
||||
src/widgets/toolbar.cpp
|
||||
|
||||
ifdef USE_386_ASM
|
||||
COMMON_SOURCES += \
|
||||
@ -226,7 +226,7 @@ COMMON_OBJS = $(addprefix $(OBJ_DIR)/, \
|
||||
$(addsuffix $(OBJ), \
|
||||
$(notdir $(basename $(COMMON_SOURCES)))))
|
||||
|
||||
ASE_SOURCES = src/main.c $(COMMON_SOURCES)
|
||||
ASE_SOURCES = src/main.cpp $(COMMON_SOURCES)
|
||||
|
||||
ASE_OBJS = $(addprefix $(OBJ_DIR)/, \
|
||||
$(addsuffix $(OBJ), \
|
||||
@ -480,10 +480,10 @@ THIRD_PARTY_LIBS = \
|
||||
|
||||
TESTS = $(addsuffix $(EXE), \
|
||||
$(basename \
|
||||
$(wildcard src/test/*.c) \
|
||||
$(wildcard src/test/raster/*.c) \
|
||||
$(wildcard src/test/jinete/*.c)))
|
||||
$(wildcard src/tests/*.cpp) \
|
||||
$(wildcard src/tests/raster/*.cpp) \
|
||||
$(wildcard src/tests/jinete/*.cpp)))
|
||||
|
||||
AUTOTESTS = $(addsuffix $(EXE), \
|
||||
$(basename \
|
||||
$(wildcard src/test/*.c)))
|
||||
$(wildcard src/tests/*.cpp)))
|
||||
|
||||
86
misc/dist.sh
86
misc/dist.sh
@ -54,17 +54,6 @@ libpng_files="third_party/libpng/*.[ch] \
|
||||
third_party/libpng/TODO \
|
||||
third_party/libpng/Y2KINFO"
|
||||
|
||||
lua_files="third_party/lua/COPYRIGHT \
|
||||
third_party/lua/HISTORY \
|
||||
third_party/lua/README \
|
||||
third_party/lua/doc/idx.html \
|
||||
third_party/lua/doc/index.html \
|
||||
third_party/lua/doc/manual.html \
|
||||
third_party/lua/include/*.h \
|
||||
third_party/lua/src/*.[ch] \
|
||||
third_party/lua/src/lib/*.[ch] \
|
||||
third_party/lua/src/lib/README"
|
||||
|
||||
zlib_files="third_party/zlib/*.[ch] \
|
||||
third_party/zlib/*.txt \
|
||||
third_party/zlib/README"
|
||||
@ -95,41 +84,59 @@ ase_files="config.h \
|
||||
docs/files/*.txt \
|
||||
docs/licenses/*.txt \
|
||||
obj/*.txt \
|
||||
obj/djgpp/*.txt \
|
||||
obj/mingw32/*.txt \
|
||||
obj/msvc/*.txt \
|
||||
obj/unix/*.txt \
|
||||
src/*.[ch] \
|
||||
src/*.cpp \
|
||||
src/*.rc \
|
||||
src/commands/*.[ch] \
|
||||
src/commands/fx/*.[ch] \
|
||||
src/console/*.[ch] \
|
||||
src/core/*.[ch] \
|
||||
src/dialogs/*.[ch] \
|
||||
src/effect/*.[ch] \
|
||||
src/file/*.[ch] \
|
||||
src/file/fli/*.[ch] \
|
||||
src/commands/*.cpp \
|
||||
src/commands/*.h \
|
||||
src/commands/fx/*.cpp \
|
||||
src/commands/fx/*.h \
|
||||
src/console/*.cpp \
|
||||
src/console/*.h \
|
||||
src/core/*.cpp \
|
||||
src/core/*.h \
|
||||
src/dialogs/*.cpp \
|
||||
src/dialogs/*.h \
|
||||
src/effect/*.cpp \
|
||||
src/effect/*.h \
|
||||
src/file/*.cpp \
|
||||
src/file/*.h \
|
||||
src/file/fli/*.cpp \
|
||||
src/file/fli/*.h \
|
||||
src/file/fli/README \
|
||||
src/file/gif/*.[ch] \
|
||||
src/intl/*.[ch] \
|
||||
src/jinete/*.[ch] \
|
||||
src/jinete/themes/*.[ch] \
|
||||
src/file/gif/*.cpp \
|
||||
src/file/gif/*.h \
|
||||
src/intl/*.cpp \
|
||||
src/intl/*.h \
|
||||
src/jinete/*.cpp \
|
||||
src/jinete/*.h \
|
||||
src/jinete/themes/*.cpp \
|
||||
src/jinete/themes/*.h \
|
||||
src/jinete/themes/Makefile.icons \
|
||||
src/jinete/themes/stand/*.pcx \
|
||||
src/modules/*.[ch] \
|
||||
src/raster/*.[ch] \
|
||||
src/modules/*.cpp \
|
||||
src/modules/*.h \
|
||||
src/raster/*.cpp \
|
||||
src/raster/*.h \
|
||||
src/raster/x86/*.s \
|
||||
src/script/*.[ch] \
|
||||
src/script/*.py \
|
||||
src/test/*.[ch] \
|
||||
src/test/jinete/*.[ch] \
|
||||
src/test/jinete/*.jid \
|
||||
src/test/jinete/*.pcx \
|
||||
src/test/jinete/*.ttf \
|
||||
src/test/jinete/*.txt \
|
||||
src/test/raster/*.[ch] \
|
||||
src/util/*.[ch] \
|
||||
src/widgets/*.[ch] \
|
||||
src/widgets/editor/*.[ch] \
|
||||
src/tests/*.cpp \
|
||||
src/tests/*.h \
|
||||
src/tests/jinete/*.cpp \
|
||||
src/tests/jinete/*.h \
|
||||
src/tests/jinete/*.jid \
|
||||
src/tests/jinete/*.pcx \
|
||||
src/tests/jinete/*.ttf \
|
||||
src/tests/jinete/*.txt \
|
||||
src/tests/raster/*.cpp \
|
||||
src/tests/raster/*.h \
|
||||
src/util/*.cpp \
|
||||
src/util/*.h \
|
||||
src/widgets/*.cpp \
|
||||
src/widgets/*.h \
|
||||
src/widgets/editor/*.cpp \
|
||||
src/widgets/editor/*.h \
|
||||
src/widgets/editor/*.txt \
|
||||
third_party/*.txt"
|
||||
|
||||
@ -146,7 +153,6 @@ cp --parents \
|
||||
$jpeg_files \
|
||||
$libart_files \
|
||||
$libpng_files \
|
||||
$lua_files \
|
||||
$zlib_files \
|
||||
$ase_files \
|
||||
"$dir/$distdir"
|
||||
|
||||
@ -207,7 +207,7 @@ static bool hooked_window1_msg_proc(JWidget widget, JMessage msg)
|
||||
if (msg->type == JM_CLOSE) {
|
||||
JLink link, next;
|
||||
JI_LIST_FOR_EACH_SAFE(windows, link, next) /* close all windows */
|
||||
jwindow_close(link->data, NULL);
|
||||
jwindow_close(reinterpret_cast<JWidget>(link->data), NULL);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
@ -129,7 +129,7 @@ void set_my_palette(void)
|
||||
pal[c].r = pal[c].b = pal[c].g = 0;
|
||||
|
||||
set_palette(pal);
|
||||
rgb_map = malloc(sizeof(RGB_MAP));
|
||||
rgb_map = (RGB_MAP*)malloc(sizeof(RGB_MAP));
|
||||
create_rgb_table(rgb_map, pal, NULL);
|
||||
}
|
||||
|
||||
@ -158,7 +158,7 @@ void set_my_palette(void)
|
||||
bmp = load_bitmap(buf, pal);
|
||||
if (bmp) {
|
||||
set_palette(pal);
|
||||
rgb_map = malloc(sizeof(RGB_MAP));
|
||||
rgb_map = (RGB_MAP*)malloc(sizeof(RGB_MAP));
|
||||
create_rgb_table(rgb_map, pal, NULL);
|
||||
}
|
||||
}
|
||||
@ -115,7 +115,7 @@ static int tip_type(void)
|
||||
|
||||
static bool tip_hook(JWidget widget, JMessage msg)
|
||||
{
|
||||
TipData *tip = jwidget_get_data(widget, tip_type());
|
||||
TipData* tip = reinterpret_cast<TipData*>(jwidget_get_data(widget, tip_type()));
|
||||
|
||||
switch (msg->type) {
|
||||
|
||||
@ -169,7 +169,7 @@ static JWidget tip_window_new(const char *text)
|
||||
|
||||
/* remove decorative widgets */
|
||||
JI_LIST_FOR_EACH_SAFE(window->children, link, next) {
|
||||
jwidget_free(link->data);
|
||||
jwidget_free(reinterpret_cast<JWidget>(link->data));
|
||||
}
|
||||
|
||||
jwidget_add_hook(window, JI_WIDGET, tip_window_hook, NULL);
|
||||
@ -63,8 +63,8 @@ int main(int argc, char *argv[])
|
||||
install_keyboard();
|
||||
install_mouse();
|
||||
|
||||
rgb_map = jmalloc(sizeof(RGB_MAP));
|
||||
color_map = jmalloc(sizeof(COLOR_MAP));
|
||||
rgb_map = (RGB_MAP*)jmalloc(sizeof(RGB_MAP));
|
||||
color_map = (COLOR_MAP*)jmalloc(sizeof(COLOR_MAP));
|
||||
|
||||
create_rgb_table(rgb_map, default_palette, NULL);
|
||||
create_trans_table(color_map, default_palette, 128, 128, 128, NULL);
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
#include "jinete/jinete.h"
|
||||
|
||||
static char *xml_src =
|
||||
static const char *xml_src =
|
||||
"<root>" "\n"
|
||||
" <item>" "\n"
|
||||
" <value1>text" "\n"
|
||||
@ -123,7 +123,7 @@ static void prt_xmlnode(JXmlNode node, int indent)
|
||||
prt("JXmlNode->value = %s\n", node->value);
|
||||
|
||||
JI_LIST_FOR_EACH(node->children, link)
|
||||
prt_xmlnode(link->data, indent+1);
|
||||
prt_xmlnode(reinterpret_cast<JXmlNode>(link->data), indent+1);
|
||||
}
|
||||
|
||||
static void prt(const char *format, ...)
|
||||
@ -141,7 +141,7 @@ static void prt(const char *format, ...)
|
||||
if (!text)
|
||||
final = jstrdup(buf);
|
||||
else {
|
||||
final = jmalloc(ustrlen(text) + ustrlen(buf) + 1);
|
||||
final = (char*)jmalloc(ustrlen(text) + ustrlen(buf) + 1);
|
||||
|
||||
ustrcpy(final, empty_string);
|
||||
ustrcat(final, text);
|
||||
@ -24,15 +24,16 @@
|
||||
|
||||
static void draw_dirty(int x1, int y, int y2, void *data)
|
||||
{
|
||||
image_hline(data, x1, y, y2, rand() % 256);
|
||||
image_hline(reinterpret_cast<Image*>(data), x1, y, y2, rand() % 256);
|
||||
}
|
||||
|
||||
int main (int argc, char *argv[])
|
||||
{
|
||||
Brush *brush1, *brush2;
|
||||
Dirty *dirty;
|
||||
Image *image;
|
||||
BITMAP *bmp;
|
||||
Brush* brush1;
|
||||
Brush* brush2;
|
||||
Dirty* dirty;
|
||||
Image* image;
|
||||
BITMAP* bmp;
|
||||
int redraw;
|
||||
int mx, my, mb, ox, oy, ob;
|
||||
int c;
|
||||
@ -169,7 +169,7 @@ void draw_filled_bezier_path(BITMAP *bmp, BEZIER_PATH *path, int color)
|
||||
|
||||
vertices = jlist_length(shape);
|
||||
if (vertices > 0) {
|
||||
points = jmalloc(sizeof(int) * vertices * 2);
|
||||
points = (int*)jmalloc(sizeof(int) * vertices * 2);
|
||||
|
||||
c = 0;
|
||||
JI_LIST_FOR_EACH(shape, link) {
|
||||
@ -263,7 +263,7 @@ int get_bezier_point (BEZIER_PATH *path, float x, float y, BEZIER_NODE **the_nod
|
||||
|
||||
int main(void)
|
||||
{
|
||||
BITMAP *virtual, *background;
|
||||
BITMAP *virt, *background;
|
||||
BEZIER_PATH *path;
|
||||
int x[4], y[4];
|
||||
int level;
|
||||
@ -282,7 +282,7 @@ int main(void)
|
||||
|
||||
path = create_bezier_path();
|
||||
|
||||
virtual = create_bitmap(SCREEN_W, SCREEN_H);
|
||||
virt = create_bitmap(SCREEN_W, SCREEN_H);
|
||||
background = create_bitmap(SCREEN_W, SCREEN_H);
|
||||
clear(background);
|
||||
|
||||
@ -401,14 +401,14 @@ int main(void)
|
||||
break;
|
||||
}
|
||||
|
||||
blit(background, virtual, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
blit(background, virt, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_CONTROL_LINES, makecol(32, 32, 32));
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_LINE, makecol(255, 0, 0));
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_CONTROL_POINTS, makecol(0, 128, 255));
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_NODES, makecol(255, 255, 255));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_CONTROL_LINES, makecol(32, 32, 32));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_LINE, makecol(255, 0, 0));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_CONTROL_POINTS, makecol(0, 128, 255));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_NODES, makecol(255, 255, 255));
|
||||
|
||||
blit(virtual, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
blit(virt, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
}
|
||||
old_x = mouse_x;
|
||||
old_y = mouse_y;
|
||||
@ -423,16 +423,16 @@ int main(void)
|
||||
}
|
||||
|
||||
/* draw */
|
||||
blit(background, virtual, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
blit(background, virt, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
|
||||
if (!key[KEY_LSHIFT])
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_CONTROL_LINES, makecol(32, 32, 32));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_CONTROL_LINES, makecol(32, 32, 32));
|
||||
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_LINE, makecol(255, 0, 0));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_LINE, makecol(255, 0, 0));
|
||||
|
||||
if (!key[KEY_LSHIFT]) {
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_CONTROL_POINTS, makecol(0, 128, 255));
|
||||
draw_bezier_path(virtual, path, DRAW_BEZIER_NODES, makecol(255, 255, 255));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_CONTROL_POINTS, makecol(0, 128, 255));
|
||||
draw_bezier_path(virt, path, DRAW_BEZIER_NODES, makecol(255, 255, 255));
|
||||
}
|
||||
|
||||
/* filled */
|
||||
@ -450,12 +450,12 @@ int main(void)
|
||||
while (key[KEY_A]);
|
||||
}
|
||||
|
||||
hline(virtual, mouse_x-4, mouse_y, mouse_x+4, makecol(255, 255, 255));
|
||||
vline(virtual, mouse_x, mouse_y-4, mouse_y+4, makecol(255, 255, 255));
|
||||
blit(virtual, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
hline(virt, mouse_x-4, mouse_y, mouse_x+4, makecol(255, 255, 255));
|
||||
vline(virt, mouse_x, mouse_y-4, mouse_y+4, makecol(255, 255, 255));
|
||||
blit(virt, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
|
||||
} while (!key[KEY_ESC]);
|
||||
|
||||
destroy_bitmap(virtual);
|
||||
destroy_bitmap(virt);
|
||||
destroy_bitmap(background);
|
||||
|
||||
allegro_exit();
|
||||
@ -16,7 +16,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "test/test.h"
|
||||
#include "tests/test.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include "jinete/jthread.h"
|
||||
@ -16,7 +16,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "test/test.h"
|
||||
#include "tests/test.h"
|
||||
|
||||
#include "jinete/jinete.h"
|
||||
#include "core/file_system.h"
|
||||
@ -46,7 +46,7 @@ static void display_fileitem(FileItem *fi, int level, int deep)
|
||||
list = fileitem_get_children(fi);
|
||||
if (list) {
|
||||
JI_LIST_FOR_EACH(list, link) {
|
||||
display_fileitem(link->data, level+1, deep-1);
|
||||
display_fileitem(reinterpret_cast<FileItem*>(link->data), level+1, deep-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -16,7 +16,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "test/test.h"
|
||||
#include "tests/test.h"
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
*/
|
||||
|
||||
#define TEST_GUI
|
||||
#include "test/test.h"
|
||||
#include "tests/test.h"
|
||||
|
||||
/**
|
||||
* Tests two widgets in a row, each one of 10x10 pixels.
|
||||
@ -16,7 +16,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "test/test.h"
|
||||
#include "tests/test.h"
|
||||
#include "jinete/jlist.h"
|
||||
|
||||
static void test_append_and_clear(void)
|
||||
Loading…
x
Reference in New Issue
Block a user