diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.mingw | 16 | ||||
| -rw-r--r-- | simon/debug.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.h | 8 |
4 files changed, 16 insertions, 15 deletions
@@ -47,9 +47,6 @@ LIBS += -lmad # DEFINES += -DUSE_ALSA # LIBS += -lasound -# Uncomment this to activate extended debugging support in Simon -DEFINES += -DSIMONDEBUG - # Uncomment this for stricter compile time code verification # CFLAGS += -Wshadow -Werror diff --git a/Makefile.mingw b/Makefile.mingw index 02251ea2ca..67eb9f2a3f 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -19,6 +19,10 @@ RM_REC = $(RM) -r ZIP = zip -q CP = cp +####################################################################### +# Default compilation parameters. Normally don't edit these # +####################################################################### + CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas DEFINES = LDFLAGS := @@ -27,6 +31,10 @@ LIBS = $(SDL_LIBS) -lmingw32 -lwinmm OBJS = scummvmico.o backends/sdl/sdl-common.o backends/sdl/sdl.o EXEEXT :=.exe +####################################################################### +# Compile options - you can modify these to tweak ScummVM compilation # +####################################################################### + # Enable this if you want ScummVM to dump all scripts it runs. # This is mainly interesting for developers. # DEFINES += -DDUMP_SCRIPTS @@ -39,8 +47,12 @@ LIBS += -lmad DEFINES += -DUSE_VORBIS LIBS += -lvorbisfile -lvorbis -logg -# Uncomment this to activate extended debugging support in Simon -DEFINES += -DSIMONDEBUG +# Uncomment this for stricter compile time code verification +# CFLAGS += -Wshadow -Werror + +####################################################################### +# Misc stuff - you should normally never have to edit this # +####################################################################### # Concat DEFINES and INCLUDES to for the CPPFLAGS CPPFLAGS= $(DEFINES) $(INCLUDES) diff --git a/simon/debug.cpp b/simon/debug.cpp index 8973eb11c0..8039762772 100644 --- a/simon/debug.cpp +++ b/simon/debug.cpp @@ -30,8 +30,6 @@ #include <sys/stat.h> #endif -#ifdef SIMONDEBUG - byte *SimonState::dumpOpcode(byte *p) { byte opcode; @@ -477,5 +475,3 @@ void SimonState::dump_vga_script(byte *ptr, uint res, uint sprite_id) dump_vga_script_always(ptr, res, sprite_id); } - -#endif diff --git a/simon/simon.h b/simon/simon.h index 3d1ad027b3..3d1034d21c 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -462,8 +462,7 @@ public: void set_hitarea_x_y(uint hitarea, int x, int y); bool is_hitarea_0x40_clear(uint hitarea); void delete_hitarea(uint hitarea); - void addNewHitArea(int id, int x, int y, int width, int height, - int flags, int unk3, Item *item_ptr); + void addNewHitArea(int id, int x, int y, int width, int height, int flags, int unk3, Item *item_ptr); HitArea *findEmptyHitArea(); void hitarea_proc_1(); void handle_verb_hitarea(HitArea * ha); @@ -587,8 +586,7 @@ public: void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h); void talk_with_speech(uint speech_id, uint num_1); void talk_with_text(uint num_1, uint num_2, const char *string_ptr, uint a, int b, uint c); - FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, - uint unk4); + FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4); void render_string(uint num_1, uint color, uint width, uint height, const char *txt); @@ -744,14 +742,12 @@ public: void dx_clear_surfaces(uint num_lines); void dx_update_screen_and_palette(); -#ifdef SIMONDEBUG void dump_video_script(byte *src, bool one_opcode_only); void dump_vga_file(byte *vga); void dump_vga_script(byte *ptr, uint res, uint sprite_id); void dump_vga_script_always(byte *ptr, uint res, uint sprite_id); void dump_vga_bitmaps(byte *vga, byte *vga1, int res); void dump_single_bitmap(int file, int image, byte *offs, int w, int h, byte base); -#endif void dx_clear_attached_from_top(uint lines); void dx_copy_from_attached_to_2(uint x, uint y, uint w, uint h); |