diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 3a2025c5..682f11ef 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I$(top_srcdir)/src/include @EXTRA_INCLUDES@ -EXTRA_DIST = cfsml.pl savegame.cfsml +EXTRA_DIST = cfsml.pl savegame.cfsml gc.h heap.h kernel_compat.h \ + kernel_types.h sci_graphics.h noinst_LIBRARIES = libsciengine.a libsciengine_a_SOURCES = savegame.c kernel.c kscripts.c klists.c scriptconsole.c \ kfile.c kgraphics.c kmath.c kevent.c kstring.c kmenu.c \ diff --git a/src/engine/game.c b/src/engine/game.c index d8a3c92d..a6672326 100644 --- a/src/engine/game.c +++ b/src/engine/game.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include "kernel_types.h" /* Structures and data from vm.c: */ extern calls_struct_t *send_calls; diff --git a/src/engine/gc.c b/src/engine/gc.c index 41aba755..063c58a0 100644 --- a/src/engine/gc.c +++ b/src/engine/gc.c @@ -18,11 +18,7 @@ ***************************************************************************/ -#include -#include -#include -#include -#include +#include "gc.h" #define WORKLIST_CHUNK_SIZE 32 diff --git a/src/include/gc.h b/src/engine/gc.h similarity index 98% rename from src/include/gc.h rename to src/engine/gc.h index 753ffbdc..b0368ee8 100644 --- a/src/include/gc.h +++ b/src/engine/gc.h @@ -22,7 +22,6 @@ #ifndef GC_H_ #define GC_H_ -#include #include #include diff --git a/src/engine/heap.c b/src/engine/heap.c index 72981ec8..cb5cacaf 100644 --- a/src/engine/heap.c +++ b/src/engine/heap.c @@ -4,7 +4,7 @@ #include #include -#include +#include "heap.h" #define assert_in_range(pos) assert(pos>=1000 && pos<=0xffff) diff --git a/src/include/heap.h b/src/engine/heap.h similarity index 100% rename from src/include/heap.h rename to src/engine/heap.h diff --git a/src/engine/kemu_old.c b/src/engine/kemu_old.c index 6a1e34af..4ec6c0a1 100644 --- a/src/engine/kemu_old.c +++ b/src/engine/kemu_old.c @@ -27,9 +27,9 @@ /* Emulation code for old kernel functions */ #include -#include -#include -#include +#include "kernel_compat.h" +#include "kernel_types.h" +#include "heap.h" #define EMU_HEAP_START_ADDR 1000 diff --git a/src/engine/kernel.c b/src/engine/kernel.c index 68727d29..df3690f4 100644 --- a/src/engine/kernel.c +++ b/src/engine/kernel.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "gc.h" #include #include #ifdef _WIN32 @@ -33,7 +33,7 @@ #endif /* _WIN32 */ #include -#include +#include "kernel_types.h" /* New kernel functions */ diff --git a/src/include/kernel_compat.h b/src/engine/kernel_compat.h similarity index 100% rename from src/include/kernel_compat.h rename to src/engine/kernel_compat.h diff --git a/src/include/kernel_types.h b/src/engine/kernel_types.h similarity index 100% rename from src/include/kernel_types.h rename to src/engine/kernel_types.h diff --git a/src/engine/kgraphics.c b/src/engine/kgraphics.c index b4d4ac6e..2f15877a 100644 --- a/src/engine/kgraphics.c +++ b/src/engine/kgraphics.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include "sci_graphics.h" #include #undef DEBUG_LSRECT diff --git a/src/engine/kscripts.c b/src/engine/kscripts.c index 95089ced..1fd7fd9a 100644 --- a/src/engine/kscripts.c +++ b/src/engine/kscripts.c @@ -27,7 +27,7 @@ #include #include -#include +#include "kernel_types.h" reg_t read_selector(state_t *s, reg_t object, selector_t selector_id, const char *file, int line) diff --git a/src/engine/kstring.c b/src/engine/kstring.c index 8641f710..c4b54263 100644 --- a/src/engine/kstring.c +++ b/src/engine/kstring.c @@ -28,7 +28,7 @@ #include #include -#include +#include "message.h" #define CHECK_OVERFLOW1(pt, size, rv) \ if (((pt) - (str_base)) + (size) > maxsize) { \ diff --git a/src/engine/message.c b/src/engine/message.c index 6ddcdedb..97171a97 100644 --- a/src/engine/message.c +++ b/src/engine/message.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "message.h" static int get_talker_trivial(index_record_cursor_t *cursor) diff --git a/src/include/message.h b/src/engine/message.h similarity index 100% rename from src/include/message.h rename to src/engine/message.h diff --git a/src/engine/savegame.c b/src/engine/savegame.c index 4a9703ca..0537fcac 100644 --- a/src/engine/savegame.c +++ b/src/engine/savegame.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include "heap.h" #ifdef _MSC_VER #include diff --git a/src/engine/savegame.cfsml b/src/engine/savegame.cfsml index 5915d777..57abbfb8 100644 --- a/src/engine/savegame.cfsml +++ b/src/engine/savegame.cfsml @@ -35,7 +35,7 @@ #include #include #include -#include +#include "heap.h" #ifdef _MSC_VER #include diff --git a/src/include/sci_graphics.h b/src/engine/sci_graphics.h similarity index 100% rename from src/include/sci_graphics.h rename to src/engine/sci_graphics.h diff --git a/src/engine/scriptdebug.c b/src/engine/scriptdebug.c index 79cd093f..1a4b53e3 100644 --- a/src/engine/scriptdebug.c +++ b/src/engine/scriptdebug.c @@ -25,13 +25,13 @@ ***************************************************************************/ /* Script debugger functionality. Absolutely not threadsafe. */ -#include +#include "gc.h" #include #include #include #include #include -#include +#include "kernel_types.h" #include #include #include diff --git a/src/engine/vm.c b/src/engine/vm.c index 8dbf6a54..d628e80e 100644 --- a/src/engine/vm.c +++ b/src/engine/vm.c @@ -29,9 +29,9 @@ #include #include #include -#include +#include "kernel_types.h" #include -#include +#include "gc.h" #include #ifdef HAVE_SETJMP_H diff --git a/src/gfx/drivers/Makefile.am b/src/gfx/drivers/Makefile.am index 776df3bd..c5dbbe0e 100644 --- a/src/gfx/drivers/Makefile.am +++ b/src/gfx/drivers/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = dc_driver.c dd_driver.cpp dd_driver.h dd_driver_line.cpp dx_driver.cpp +EXTRA_DIST = dc_driver.c dd_driver.cpp dd_driver.h dd_driver_line.cpp dx_driver.cpp dx_driver.h INCLUDES = -I$(top_srcdir)/src/include @ac_ggi_includes@ @ac_png_includes@ @X_CFLAGS@ @EXTRA_INCLUDES@ AM_CFLAGS = $(SDL_CFLAGS) LDADD = $(LDADD_ALL) diff --git a/src/gfx/drivers/dx_driver.cpp b/src/gfx/drivers/dx_driver.cpp index 89100b09..899d1fa7 100644 --- a/src/gfx/drivers/dx_driver.cpp +++ b/src/gfx/drivers/dx_driver.cpp @@ -54,7 +54,7 @@ #error NOTE: This file MUST be compiled as C++. In Visual C++, use the /Tp command line option. #endif -#include +#include "dx_driver.h" #define TO_STRING2(x) #x #define TO_STRING(x) TO_STRING2(x) diff --git a/src/include/graphics_directx.h b/src/gfx/drivers/dx_driver.h similarity index 100% rename from src/include/graphics_directx.h rename to src/gfx/drivers/dx_driver.h diff --git a/src/include/Makefile.am b/src/include/Makefile.am index f8472431..31669024 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -2,21 +2,18 @@ SUBDIRS = win32 beos EXTRA_DIST = old_objects.h kernel.h event.h \ kdebug.h sci_conf.h resource.h script.h \ vocabulary.h uinput.h console.h script.h vm.h \ - engine.h util.h heap.h menubar.h versions.h sci_dos.h \ + engine.h util.h menubar.h versions.h sci_dos.h \ gfx_driver.h gfx_operations.h gfx_options.h \ gfx_resmgr.h gfx_resource.h gfx_widgets.h \ gfx_state_internal.h gfx_system.h gfx_tools.h \ - sci_graphics.h sci_widgets.h scitypes.h sbtree.h \ - sciresource.h midiout.h \ - midi_device.h modules.h sci_memory.h games.h \ + sci_widgets.h scitypes.h sbtree.h \ + sciresource.h modules.h sci_memory.h \ hashmap.h int_hashmap.h sys_strings.h heapmgr.h \ - kernel_types.h sfx_iterator.h sfx_songlib.h \ - sfx_engine.h vm_types.h seg_manager.h kernel_compat.h \ - sfx_sequencer.h sfx_device.h sfx_adlib.h \ + sfx_iterator.h sfx_songlib.h \ + sfx_engine.h vm_types.h seg_manager.h \ sfx_timer.h sfx_player.h gfx_res_options.h \ - sfx_audiobuf.h sfx_time.h sfx_softseq.h sci_midi.h \ - sfx_core.h sfx_pcm.h listener.h sfx_mixer.h \ - sfx_iterator_internal.h game_select.h exe.h exe_dec.h \ - reg_t_hashmap.h gc.h list.h aatree.h \ - graphics_directx.h sfx-instrument-map.h + sfx_time.h sci_midi.h \ + sfx_core.h sfx_pcm.h listener.h \ + sfx_iterator_internal.h game_select.h \ + reg_t_hashmap.h list.h aatree.h diff --git a/src/include/engine.h b/src/include/engine.h index c9b1e5b8..08a26fe9 100644 --- a/src/include/engine.h +++ b/src/include/engine.h @@ -41,7 +41,6 @@ #include #include #include -#include #include #define FREESCI_CURRENT_SAVEGAME_VERSION 7 diff --git a/src/scicore/Makefile.am b/src/scicore/Makefile.am index 6b7c2562..dfc61adb 100644 --- a/src/scicore/Makefile.am +++ b/src/scicore/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = -I$(top_srcdir)/src/include @EXTRA_INCLUDES@ EXTRA_DIST = sci_dos.c treedef.1 treedef.2 treedef.3 hufftree.1 \ hufftree.2 hufftree.3 huffmake.pl \ - hashmap.c + hashmap.c exe.h exe_dec.h games.h noinst_LIBRARIES = libscicore.a libscicore_a_SOURCES = aatree.c tools.c resource.c decompress0.c \ versions.c decompress01.c decompress1.c decompress11.c \ diff --git a/src/include/exe.h b/src/scicore/exe.h similarity index 100% rename from src/include/exe.h rename to src/scicore/exe.h diff --git a/src/include/exe_dec.h b/src/scicore/exe_dec.h similarity index 100% rename from src/include/exe_dec.h rename to src/scicore/exe_dec.h diff --git a/src/scicore/exe_lzexe.c b/src/scicore/exe_lzexe.c index e578bb4c..2331c01f 100644 --- a/src/scicore/exe_lzexe.c +++ b/src/scicore/exe_lzexe.c @@ -29,7 +29,7 @@ #include #include -#include +#include "exe_dec.h" /* Macro to interpret two sequential bytes as an unsigned integer. */ #define UINT16(A) ((*((A) + 1) << 8) + *(A)) diff --git a/src/scicore/exe_raw.c b/src/scicore/exe_raw.c index 4932562b..ecc7089b 100644 --- a/src/scicore/exe_raw.c +++ b/src/scicore/exe_raw.c @@ -33,7 +33,7 @@ struct _exe_handle FILE *f; }; -#include +#include "exe_dec.h" static exe_handle_t * raw_open(const char *filename) diff --git a/src/include/games.h b/src/scicore/games.h similarity index 100% rename from src/include/games.h rename to src/scicore/games.h diff --git a/src/scicore/versions.c b/src/scicore/versions.c index 5b9790c8..06cab77c 100644 --- a/src/scicore/versions.c +++ b/src/scicore/versions.c @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include "games.h" +#include "exe.h" /* Maxmimum number of bytes to hash from start of file */ #define VERSION_DETECT_HASH_SIZE 1000000 diff --git a/src/sfx/Makefile.am b/src/sfx/Makefile.am index c9d951d3..b085a7c9 100644 --- a/src/sfx/Makefile.am +++ b/src/sfx/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = seq timer player device mixer pcm_device softseq INCLUDES = -I$(top_srcdir)/src/include @EXTRA_INCLUDES@ -EXTRA_DIST = timetest.c +EXTRA_DIST = timetest.c adlib.h device.h mixer.h sequencer.h softseq.h noinst_LIBRARIES = libscisound.a libscisoundlib.a libscisound_a_SOURCES = iterator.c songlib.c core.c pcm-iterator.c libscisoundlib_a_SOURCES = time.c adlib.c diff --git a/src/sfx/adlib.c b/src/sfx/adlib.c index 978a1544..dab39027 100644 --- a/src/sfx/adlib.c +++ b/src/sfx/adlib.c @@ -17,7 +17,7 @@ ***************************************************************************/ -#include +#include "adlib.h" adlib_instr adlib_sbi[96]; diff --git a/src/include/sfx_adlib.h b/src/sfx/adlib.h similarity index 100% rename from src/include/sfx_adlib.h rename to src/sfx/adlib.h diff --git a/src/sfx/core.c b/src/sfx/core.c index 0a570a21..9d55ad6b 100644 --- a/src/sfx/core.c +++ b/src/sfx/core.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "mixer.h" #include diff --git a/src/include/sfx_device.h b/src/sfx/device.h similarity index 100% rename from src/include/sfx_device.h rename to src/sfx/device.h diff --git a/src/sfx/device/alsa-midi.c b/src/sfx/device/alsa-midi.c index b18e1cab..67ca9959 100644 --- a/src/sfx/device/alsa-midi.c +++ b/src/sfx/device/alsa-midi.c @@ -26,7 +26,7 @@ ***************************************************************************/ #include -#include +#include "../device.h" #ifdef HAVE_ALSA #include diff --git a/src/sfx/device/camd-midi.c b/src/sfx/device/camd-midi.c index 5249f211..3af12f19 100644 --- a/src/sfx/device/camd-midi.c +++ b/src/sfx/device/camd-midi.c @@ -31,7 +31,7 @@ #ifdef HAVE_PROTO_CAMD_H #include "sfx_engine.h" -#include "sfx_device.h" +#include "../device.h" #include #include diff --git a/src/sfx/device/devices.c b/src/sfx/device/devices.c index 0fe404a9..78d8c427 100644 --- a/src/sfx/device/devices.c +++ b/src/sfx/device/devices.c @@ -28,7 +28,7 @@ #ifdef HAVE_CONFIG_H # include #endif -#include +#include "../device.h" #include #ifndef SCUMMVM diff --git a/src/sfx/device/unixraw-midi.c b/src/sfx/device/unixraw-midi.c index 98ce11ec..69ce3890 100644 --- a/src/sfx/device/unixraw-midi.c +++ b/src/sfx/device/unixraw-midi.c @@ -26,7 +26,7 @@ ***************************************************************************/ #include -#include +#include "../device.h" #include #include diff --git a/src/include/sfx_mixer.h b/src/sfx/mixer.h similarity index 100% rename from src/include/sfx_mixer.h rename to src/sfx/mixer.h diff --git a/src/sfx/mixer/dc.c b/src/sfx/mixer/dc.c index 1c7c57fd..52b3ab5c 100644 --- a/src/sfx/mixer/dc.c +++ b/src/sfx/mixer/dc.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "../mixer.h" #include #include #include diff --git a/src/sfx/mixer/mixers.c b/src/sfx/mixer/mixers.c index b3514ea6..1c7e27ab 100644 --- a/src/sfx/mixer/mixers.c +++ b/src/sfx/mixer/mixers.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "../mixer.h" #include extern sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear; diff --git a/src/sfx/mixer/soft.c b/src/sfx/mixer/soft.c index 527657ba..9f833017 100644 --- a/src/sfx/mixer/soft.c +++ b/src/sfx/mixer/soft.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "../mixer.h" #include /* Max. number of microseconds in difference allowed between independent audio streams */ diff --git a/src/sfx/mixer/test.c b/src/sfx/mixer/test.c index 02b112da..20b3e952 100644 --- a/src/sfx/mixer/test.c +++ b/src/sfx/mixer/test.c @@ -27,7 +27,7 @@ /* Mixer inspection/test program */ -#include +#include "../mixer.h" #include #if 0 diff --git a/src/sfx/pcm_device/Makefile.am b/src/sfx/pcm_device/Makefile.am index f49daa67..b13a3aab 100644 --- a/src/sfx/pcm_device/Makefile.am +++ b/src/sfx/pcm_device/Makefile.am @@ -1,7 +1,7 @@ noinst_LIBRARIES = libscipcm.a INCLUDES = -I$(top_srcdir)/src/include @EXTRA_INCLUDES@ AM_CFLAGS = $(SDL_CFLAGS) -EXTRA_DIST = +EXTRA_DIST = audiobuf.h libscipcm_a_SOURCES = audiobuf.c pcm_devices.c sdl.c alsa.c audbuf_test_LDADD = libscipcm.a ../../scicore/libscicore.a check_PROGRAMS = audbuf_test diff --git a/src/sfx/pcm_device/alsa.c b/src/sfx/pcm_device/alsa.c index 3bbe10fc..26d4c350 100644 --- a/src/sfx/pcm_device/alsa.c +++ b/src/sfx/pcm_device/alsa.c @@ -28,7 +28,7 @@ /* Based on ALSA's pcm.c example. */ #include -#include +#include "audiobuf.h" #ifdef HAVE_ALSA #ifdef HAVE_PTHREAD diff --git a/src/sfx/pcm_device/audbuf_test.c b/src/sfx/pcm_device/audbuf_test.c index 49439e0d..216aa907 100644 --- a/src/sfx/pcm_device/audbuf_test.c +++ b/src/sfx/pcm_device/audbuf_test.c @@ -27,7 +27,7 @@ ***************************************************************************/ -#include +#include "audiobuf.h" #if 0 sfx_audio_buf_t buf; diff --git a/src/sfx/pcm_device/audiobuf.c b/src/sfx/pcm_device/audiobuf.c index c4298ad7..fa23708c 100644 --- a/src/sfx/pcm_device/audiobuf.c +++ b/src/sfx/pcm_device/audiobuf.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "audiobuf.h" #define NO_BUFFER_UNDERRUN 0 #define SAW_BUFFER_UNDERRUN 1 diff --git a/src/include/sfx_audiobuf.h b/src/sfx/pcm_device/audiobuf.h similarity index 100% rename from src/include/sfx_audiobuf.h rename to src/sfx/pcm_device/audiobuf.h diff --git a/src/sfx/pcm_device/sdl.c b/src/sfx/pcm_device/sdl.c index 6415edc3..bd125835 100644 --- a/src/sfx/pcm_device/sdl.c +++ b/src/sfx/pcm_device/sdl.c @@ -19,7 +19,7 @@ ***************************************************************************/ #include -#include +#include "audiobuf.h" #ifdef HAVE_SDL diff --git a/src/sfx/player/polled.c b/src/sfx/player/polled.c index 85a5aa5d..59eeceaa 100644 --- a/src/sfx/player/polled.c +++ b/src/sfx/player/polled.c @@ -27,8 +27,8 @@ /* Polled player, mostly for PCM-based thingies (which _can_ poll, after all) */ #include -#include -#include +#include "../softseq.h" +#include "../mixer.h" static song_iterator_t *play_it; static int play_paused = 0; diff --git a/src/sfx/player/realtime.c b/src/sfx/player/realtime.c index 5bd170f1..752b0b81 100644 --- a/src/sfx/player/realtime.c +++ b/src/sfx/player/realtime.c @@ -29,7 +29,7 @@ ** enough, I guess. */ #include -#include +#include "../sequencer.h" static sfx_sequencer_t *seq; diff --git a/src/sfx/seq/Makefile.am b/src/sfx/seq/Makefile.am index 6f98df4b..74fb4fda 100644 --- a/src/sfx/seq/Makefile.am +++ b/src/sfx/seq/Makefile.am @@ -1,4 +1,5 @@ noinst_LIBRARIES = libsciseq.a INCLUDES = -I$(top_srcdir)/src/include @EXTRA_INCLUDES@ +EXTRA_DIST = instrument-map.h libsciseq_a_SOURCES = sequencers.c oss-adlib.c mt32.c gm.c instrument-map.c \ map-mt32-to-gm.c diff --git a/src/sfx/seq/gm.c b/src/sfx/seq/gm.c index c3dc135d..4889e76e 100644 --- a/src/sfx/seq/gm.c +++ b/src/sfx/seq/gm.c @@ -32,9 +32,9 @@ #ifdef HAVE_UNISTD_H # include #endif -#include -#include -#include +#include "../sequencer.h" +#include "../device.h" +#include "instrument-map.h" #include static midi_writer_t *writer = NULL; diff --git a/src/sfx/seq/instrument-map.c b/src/sfx/seq/instrument-map.c index 9f365eea..0d829a05 100644 --- a/src/sfx/seq/instrument-map.c +++ b/src/sfx/seq/instrument-map.c @@ -28,7 +28,7 @@ #include #include "sci_midi.h" #include "sci_memory.h" -#include "sfx-instrument-map.h" +#include "instrument-map.h" #include "sfx_engine.h" sfx_instrument_map_t * diff --git a/src/include/sfx-instrument-map.h b/src/sfx/seq/instrument-map.h similarity index 99% rename from src/include/sfx-instrument-map.h rename to src/sfx/seq/instrument-map.h index decd83b3..85f654d6 100644 --- a/src/include/sfx-instrument-map.h +++ b/src/sfx/seq/instrument-map.h @@ -32,7 +32,7 @@ #include #include "resource.h" -#include "sfx_device.h" +#include "../device.h" #define SFX_INSTRUMENTS_NR 0x80 #define SFX_RHYTHM_NR 0x80 diff --git a/src/sfx/seq/map-mt32-to-gm.c b/src/sfx/seq/map-mt32-to-gm.c index cdf175d6..bcaf3556 100644 --- a/src/sfx/seq/map-mt32-to-gm.c +++ b/src/sfx/seq/map-mt32-to-gm.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include "instrument-map.h" #define DEBUG_MT32_TO_GM diff --git a/src/sfx/seq/mt32.c b/src/sfx/seq/mt32.c index 0466309d..b71d4749 100644 --- a/src/sfx/seq/mt32.c +++ b/src/sfx/seq/mt32.c @@ -22,8 +22,8 @@ #ifdef HAVE_UNISTD_H # include #endif -#include -#include +#include "../sequencer.h" +#include "instrument-map.h" #include #ifdef _WIN32 diff --git a/src/sfx/seq/oss-adlib.c b/src/sfx/seq/oss-adlib.c index 91c35197..0406556f 100644 --- a/src/sfx/seq/oss-adlib.c +++ b/src/sfx/seq/oss-adlib.c @@ -21,11 +21,11 @@ #ifdef HAVE_UNISTD_H # include #endif -#include +#include "../sequencer.h" #ifdef HAVE_SYS_SOUNDCARD_H -#include +#include "../adlib.h" #include #include diff --git a/src/sfx/seq/sequencers.c b/src/sfx/seq/sequencers.c index 349b9982..cb43381f 100644 --- a/src/sfx/seq/sequencers.c +++ b/src/sfx/seq/sequencers.c @@ -25,7 +25,7 @@ ***************************************************************************/ -#include +#include "../sequencer.h" #include #ifndef SCUMMVM diff --git a/src/include/sfx_sequencer.h b/src/sfx/sequencer.h similarity index 99% rename from src/include/sfx_sequencer.h rename to src/sfx/sequencer.h index cfee48d6..586e4b3e 100644 --- a/src/include/sfx_sequencer.h +++ b/src/sfx/sequencer.h @@ -28,7 +28,7 @@ #endif /* HAVE_CONFIG_H */ #include #include -#include +#include "device.h" #include #define SFX_SEQ_PATCHFILE_NONE -1 diff --git a/src/include/sfx_softseq.h b/src/sfx/softseq.h similarity index 99% rename from src/include/sfx_softseq.h rename to src/sfx/softseq.h index b4d542e3..38efac6d 100644 --- a/src/include/sfx_softseq.h +++ b/src/sfx/softseq.h @@ -32,7 +32,7 @@ #include #include -#include +#include "sequencer.h" #include diff --git a/src/sfx/softseq/SN76496.c b/src/sfx/softseq/SN76496.c index 70cd3c15..cb32b89f 100644 --- a/src/sfx/softseq/SN76496.c +++ b/src/sfx/softseq/SN76496.c @@ -28,7 +28,7 @@ ***************************************************************************/ /* Tandy/PCJr sequencer for FreeSCI */ -#include +#include "../softseq.h" #include #define FREQUENCY 44100 diff --git a/src/sfx/softseq/amiga.c b/src/sfx/softseq/amiga.c index e7d97b25..12240897 100644 --- a/src/sfx/softseq/amiga.c +++ b/src/sfx/softseq/amiga.c @@ -29,7 +29,7 @@ #include "resource.h" #include "sci_memory.h" -#include "sfx_softseq.h" +#include "../softseq.h" #define FREQUENCY 44100 #define CHANNELS_NR 10 diff --git a/src/sfx/softseq/fluidsynth.c b/src/sfx/softseq/fluidsynth.c index 04faceb5..a44d75e5 100644 --- a/src/sfx/softseq/fluidsynth.c +++ b/src/sfx/softseq/fluidsynth.c @@ -32,9 +32,9 @@ #include -#include "sfx_softseq.h" -#include "sfx_sequencer.h" -#include "sfx_device.h" +#include "../softseq.h" +#include "../sequencer.h" +#include "../device.h" #include "resource.h" static sfx_sequencer_t *gmseq; diff --git a/src/sfx/softseq/mt32.cpp b/src/sfx/softseq/mt32.cpp index 4b2f23f3..6b37673c 100644 --- a/src/sfx/softseq/mt32.cpp +++ b/src/sfx/softseq/mt32.cpp @@ -26,9 +26,9 @@ ***************************************************************************/ extern "C" { -#include "sfx_softseq.h" -#include "sfx_sequencer.h" -#include "sfx_device.h" +#include "../softseq.h" +#include "../sequencer.h" +#include "../device.h" #include "resource.h" #include "sci_memory.h" } diff --git a/src/sfx/softseq/opl2.c b/src/sfx/softseq/opl2.c index 56860f61..ed2f3001 100644 --- a/src/sfx/softseq/opl2.c +++ b/src/sfx/softseq/opl2.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include "../softseq.h" +#include "../adlib.h" #include #include "fmopl.h" diff --git a/src/sfx/softseq/pcspeaker.c b/src/sfx/softseq/pcspeaker.c index 27c1cbad..771c8f0d 100644 --- a/src/sfx/softseq/pcspeaker.c +++ b/src/sfx/softseq/pcspeaker.c @@ -28,7 +28,7 @@ ***************************************************************************/ /* PC speaker software sequencer for FreeSCI */ -#include +#include "../softseq.h" #include #define FREQUENCY 94020 diff --git a/src/sfx/softseq/softsequencers.c b/src/sfx/softseq/softsequencers.c index 2c45b9d9..d0f54419 100644 --- a/src/sfx/softseq/softsequencers.c +++ b/src/sfx/softseq/softsequencers.c @@ -31,7 +31,7 @@ # include #endif -#include +#include "../softseq.h" extern sfx_softseq_t sfx_softseq_opl2; extern sfx_softseq_t sfx_softseq_SN76496; diff --git a/src/include/graphics_png.h b/src/tools/graphics_png.h similarity index 100% rename from src/include/graphics_png.h rename to src/tools/graphics_png.h diff --git a/src/tools/sciunpack.c b/src/tools/sciunpack.c index 032462a8..e5b3b39a 100644 --- a/src/tools/sciunpack.c +++ b/src/tools/sciunpack.c @@ -58,7 +58,7 @@ #ifdef DRAW_GRAPHICS # ifdef HAVE_LIBPNG -# include +# include "graphics_png.h" # endif /* HAVE_LIBPNG */ #endif /* DRAW_GRAPHICS */ diff --git a/src/win32/msvc71-2003/fsci_dll/fsci_dll.vcproj b/src/win32/msvc71-2003/fsci_dll/fsci_dll.vcproj index beda1a8c..33065a66 100644 --- a/src/win32/msvc71-2003/fsci_dll/fsci_dll.vcproj +++ b/src/win32/msvc71-2003/fsci_dll/fsci_dll.vcproj @@ -589,19 +589,19 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\event.h"> + RelativePath="..\..\..\scicore\exe.h"> + RelativePath="..\..\..\scicore\exe_dec.h"> + RelativePath="..\..\..\scicore\games.h"> + RelativePath="..\..\..\engine\gc.h"> @@ -634,13 +634,13 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\gfx_widgets.h"> + RelativePath="..\..\..\gfx\drivers\dx_driver.h"> + RelativePath="..\..\..\engine\heap.h"> @@ -655,10 +655,10 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\kernel.h"> + RelativePath="..\..\..\engine\kernel_compat.h"> + RelativePath="..\..\..\engine\kernel_types.h"> @@ -688,7 +688,7 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\sci_conf.h"> + RelativePath="..\..\..\engine\sci_graphics.h"> @@ -712,20 +712,20 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\seg_manager.h"> + RelativePath="..\..\..\sfx\adlib.h"> + RelativePath="..\..\..\sfx\pcm_device\audiobuf.h"> + RelativePath="..\..\..\sfx\device.h"> @@ -737,7 +737,7 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\sfx_iterator_internal.h"> + RelativePath="..\..\..\sfx\mixer.h"> @@ -746,10 +746,10 @@ copy /y $(SolutionDir)..\..\..\..\SDL\lib\sdl.dll $(OutDir)\ RelativePath="..\..\..\include\sfx_player.h"> + RelativePath="..\..\..\sfx\sequencer.h"> + RelativePath="..\..\..\sfx\softseq.h"> diff --git a/src/win32/msvc80-2005/fsci_dll/fsci_dll.vcproj b/src/win32/msvc80-2005/fsci_dll/fsci_dll.vcproj index 0139bc94..51d900f7 100644 --- a/src/win32/msvc80-2005/fsci_dll/fsci_dll.vcproj +++ b/src/win32/msvc80-2005/fsci_dll/fsci_dll.vcproj @@ -772,11 +772,11 @@ >