# HG changeset patch # User Matti Hamalainen # Date 1366082282 -10800 # Node ID 469119cab5b244b984b37e01b76e977f2511b996 # Parent d9888292f9718c2dca0361803526228fb1ae2f51 More cleanup work. Build is broken for now. diff -r d9888292f971 -r 469119cab5b2 Makefile.gen --- a/Makefile.gen Tue Apr 16 06:04:22 2013 +0300 +++ b/Makefile.gen Tue Apr 16 06:18:02 2013 +0300 @@ -30,8 +30,11 @@ EDITOR_PRO = editor.pro EDITOR_MAKEFILE = Makefile.editor -EDITOR_SOURCES = edmain.cpp edgui.cpp edview.cpp edtlobj.cpp edtimeline.cpp edwaveform.cpp edres.cpp -EDITOR_HEADERS = edmain.h edtlobj.h edview.h edtimeline.h edwaveform.h edres.h +EDITOR_SOURCES = editor/edmain.cpp editor/edgui.cpp editor/edview.cpp \ + editor/edtlobj.cpp editor/edtimeline.cpp editor/edwaveform.cpp \ + editor/edres.cpp +EDITOR_HEADERS = editor/edmain.h editor/edtlobj.h editor/edview.h \ + editor/edtimeline.h editor/edwaveform.h editor/edres.h ### @@ -122,7 +125,7 @@ ifeq ($(DM_BUILD_TESTS),yes) ifeq ($(DM_GFX_BLITS),yes) ifeq ($(DM_USE_STDIO),yes) -BINARIES += blittest vptest efu +TESTS_BINARIES += blittest vptest efu endif endif endif @@ -212,7 +215,8 @@ ifeq ($(DM_USE_STDIO),yes) TOOL_BINARIES+= objlink data2inc gfxconv gentab ifeq ($(SUP_MODLOAD),yes) -TOOL_BINARIES+= viewmod mod2wav testpl +TOOL_BINARIES+= viewmod mod2wav +TESTS_BINARIES+= testpl ifeq ($(DM_GFX_BLITS),yes) TOOL_BINARIES+= view64 ifeq ($(DM_GFX_BM_TEXT),yes) @@ -232,6 +236,14 @@ DM_CFLAGS += -DDM_USE_LIBPNG $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS) endif +ifeq ($(DM_BUILD_TESTS),yes) +TESTS_BINARIES += vecmattest fptest +endif + +FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT) +DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT) + + ### ### Rest of the rules ### @@ -243,35 +255,46 @@ DMLIB_A=$(OBJPATH)dmlib.a -DMLIB_OBJS += dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \ +DMLIB_OBJS += \ + dmfile.o dmbstr.o dmlib.o dmlerp.o dmstring.o \ dmargs.o dmvecmat.o dmperlin.o dmimage.o \ - dmwav.o dmengine.o dmq3d.o + dmwav.o dmengine.o dmq3d.o -ifeq ($(DM_BUILD_TESTS),yes) -BINARIES += vecmattest fptest -endif -FONTCONV_BIN=$(BINPATH)fontconv$(EXEEXT) -DATA2INC_BIN=$(BINPATH)data2inc$(EXEEXT) - +TESTS_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES))) TOOL_TARGETS = $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES))) -TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) $(TOOL_TARGETS) +TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \ + $(TOOL_TARGETS) $(TESTS_TARGETS) all: $(TARGETS) ### ### Generic rules ### -$(OBJPATH)gtk%.o: $(DMLIB)gtk%.c $(DMLIB)gtk%.h - @echo " CC $+" - @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(GTK_CFLAGS) - - $(OBJPATH)%.d: $(DMLIB)%.c @echo > $@ @grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done +$(OBJPATH)%.o: $(DMLIB)tests/%.c $(DMLIB)tests/%.h + @echo " CC $<" + @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) + +$(OBJPATH)%.o: $(DMLIB)tests/%.c + @echo " CC $<" + @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) + + +$(OBJPATH)%.o: $(DMLIB)tools/%.c $(DMLIB)tools/%.h + @echo " CC $<" + @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) + +$(OBJPATH)%.o: $(DMLIB)tools/%.c + @echo " CC $<" + @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) + + + $(OBJPATH)%.o: $(DMLIB)%.c $(DMLIB)%.h @echo " CC $<" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) @@ -375,6 +398,11 @@ @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm +$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A) + @echo " LINK $+" + @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) + + $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) @@ -402,10 +430,6 @@ @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -$(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A) - @echo " LINK $+" - @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) - $(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) diff -r d9888292f971 -r 469119cab5b2 buttons.svg --- a/buttons.svg Tue Apr 16 06:04:22 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,152 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff -r d9888292f971 -r 469119cab5b2 editor/buttons.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/editor/buttons.svg Tue Apr 16 06:18:02 2013 +0300 @@ -0,0 +1,152 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff -r d9888292f971 -r 469119cab5b2 editor/pause.png Binary file editor/pause.png has changed diff -r d9888292f971 -r 469119cab5b2 editor/play1.png Binary file editor/play1.png has changed diff -r d9888292f971 -r 469119cab5b2 editor/play2.png Binary file editor/play2.png has changed diff -r d9888292f971 -r 469119cab5b2 editor/rewind.png Binary file editor/rewind.png has changed diff -r d9888292f971 -r 469119cab5b2 editor/stop.png Binary file editor/stop.png has changed diff -r d9888292f971 -r 469119cab5b2 fptest.c --- a/fptest.c Tue Apr 16 06:04:22 2013 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -#include "dmlib.h" -#include - -#define FP_DW_SIZE 8 -#define FP_W0_SIZE 4 - -void check(const char *str, DMFixedPoint v, Sint64 dw) -{ - DMFixedPoint *q = (DMFixedPoint *) &dw; - - printf("%-15s = ", str); FP_PRINTF(v); printf("\n"); - printf("should be = "); FP_PRINTF((*q)); printf("\n"); - - if (v.dw != dw) - { - printf("ERROR! A test value differs from expected!\n"); - exit(1); - } -} - -int main(int argc, char *argv[]) -{ - int i; - DMFixedPoint a, b, delta; - char *s; - - (void) argc; - (void) argv; - - // Check host characteristics - switch (SDL_BYTEORDER) - { - case SDL_BIG_ENDIAN: s = "big endian"; break; - case SDL_LIL_ENDIAN: s = "little endian"; break; - default: s = "unknown?"; break; - } - - printf( - "SDL byte order = %s (%d)\n\n", s, SDL_BYTEORDER); - - printf( - "sizeof(DMFixedPoint) = %d bytes\n" - "sizeof(DMFixedPoint.dw = %d bytes (should be %d)\n" - "sizeof(DMFixedPoint.w[0] = %d bytes (should be %d)\n", - sizeof(a), sizeof(a.dw), FP_DW_SIZE, - sizeof(a.w[0]), FP_W0_SIZE); - - if (sizeof(a.dw) != FP_DW_SIZE || sizeof(a.w[0]) != FP_W0_SIZE) - { - printf("ERROR! Some type sizes DO NOT MATCH!\n"); - return -1; - } - - // TEST #1 - printf("\nTEST #1: set initial values\n"); - FP_SETHL(a, 55, 0); - check("a", a, 0x0000003700000000ULL); - - FP_CONV(b, 178); - check("b", b, 0x00000000000000b2ULL); - - FP_DIV_R(delta, a, b); - check("delta", delta, 0x000000004f19e33cULL); - - // Test #2 - printf("\nTEST #2: 50 x (a + delta)\n"); - for (i = 0; i < 50; i++) - { - FP_ADD(a, delta); - } - check("a end", a, 0x00000046730e61b8ULL); - - - // Test #3 - printf("\nTEST #3: 50 x (a - delta)\n"); - for (i = 0; i < 50; i++) - { - FP_SUB(a, delta); - } - check("a end", a, 0x0000003700000000ULL); - - // Test #4 - printf("\nTEST #4: 5 x (a * delta)\n"); - for (i = 0; i < 5; i++) - { - FP_MUL(a, delta); - } - check("a end", a, 0xd644e40000000000ULL); - - // Test #5 - printf("\nTEST #4: 2 x (a / delta)\n"); - for (i = 0; i < 2; i++) - { - FP_DIV(a, delta); - } - check("a end", a, 8ULL); - - return 0; -} diff -r d9888292f971 -r 469119cab5b2 pause.png Binary file pause.png has changed diff -r d9888292f971 -r 469119cab5b2 play1.png Binary file play1.png has changed diff -r d9888292f971 -r 469119cab5b2 play2.png Binary file play2.png has changed diff -r d9888292f971 -r 469119cab5b2 rewind.png Binary file rewind.png has changed diff -r d9888292f971 -r 469119cab5b2 stop.png Binary file stop.png has changed diff -r d9888292f971 -r 469119cab5b2 tests/fptest.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/fptest.c Tue Apr 16 06:18:02 2013 +0300 @@ -0,0 +1,99 @@ +#include "dmlib.h" +#include + +#define FP_DW_SIZE 8 +#define FP_W0_SIZE 4 + +void check(const char *str, DMFixedPoint v, Sint64 dw) +{ + DMFixedPoint *q = (DMFixedPoint *) &dw; + + printf("%-15s = ", str); FP_PRINTF(v); printf("\n"); + printf("should be = "); FP_PRINTF((*q)); printf("\n"); + + if (v.dw != dw) + { + printf("ERROR! A test value differs from expected!\n"); + exit(1); + } +} + +int main(int argc, char *argv[]) +{ + int i; + DMFixedPoint a, b, delta; + char *s; + + (void) argc; + (void) argv; + + // Check host characteristics + switch (SDL_BYTEORDER) + { + case SDL_BIG_ENDIAN: s = "big endian"; break; + case SDL_LIL_ENDIAN: s = "little endian"; break; + default: s = "unknown?"; break; + } + + printf( + "SDL byte order = %s (%d)\n\n", s, SDL_BYTEORDER); + + printf( + "sizeof(DMFixedPoint) = %d bytes\n" + "sizeof(DMFixedPoint.dw = %d bytes (should be %d)\n" + "sizeof(DMFixedPoint.w[0] = %d bytes (should be %d)\n", + sizeof(a), sizeof(a.dw), FP_DW_SIZE, + sizeof(a.w[0]), FP_W0_SIZE); + + if (sizeof(a.dw) != FP_DW_SIZE || sizeof(a.w[0]) != FP_W0_SIZE) + { + printf("ERROR! Some type sizes DO NOT MATCH!\n"); + return -1; + } + + // TEST #1 + printf("\nTEST #1: set initial values\n"); + FP_SETHL(a, 55, 0); + check("a", a, 0x0000003700000000ULL); + + FP_CONV(b, 178); + check("b", b, 0x00000000000000b2ULL); + + FP_DIV_R(delta, a, b); + check("delta", delta, 0x000000004f19e33cULL); + + // Test #2 + printf("\nTEST #2: 50 x (a + delta)\n"); + for (i = 0; i < 50; i++) + { + FP_ADD(a, delta); + } + check("a end", a, 0x00000046730e61b8ULL); + + + // Test #3 + printf("\nTEST #3: 50 x (a - delta)\n"); + for (i = 0; i < 50; i++) + { + FP_SUB(a, delta); + } + check("a end", a, 0x0000003700000000ULL); + + // Test #4 + printf("\nTEST #4: 5 x (a * delta)\n"); + for (i = 0; i < 5; i++) + { + FP_MUL(a, delta); + } + check("a end", a, 0xd644e40000000000ULL); + + // Test #5 + printf("\nTEST #4: 2 x (a / delta)\n"); + for (i = 0; i < 2; i++) + { + FP_DIV(a, delta); + } + check("a end", a, 8ULL); + + return 0; +}