Moved non-public includes to their respective directories

wjp · Jan 24, 2009 · 08218c1 · 08218c1
1 parent 798a65a
commit 08218c1
Show file tree

Hide file tree

Showing 76 changed files with 129 additions and 136 deletions.
diff --git 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
@@ -43,7 +43,7 @@
 #include <engine.h>
 #include <versions.h>
 #include <kernel.h>
-#include <kernel_types.h>
+#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
@@ -18,11 +18,7 @@
 
 ***************************************************************************/
 
-#include <gc.h>
-#include <vm_types.h>
-#include <reg_t_hashmap.h>
-#include <seg_manager.h>
-#include <engine.h>
+#include "gc.h"
 
 #define WORKLIST_CHUNK_SIZE 32
 

diff --git a/src/include/gc.h → src/engine/gc.h b/src/include/gc.h → src/engine/gc.h
@@ -22,7 +22,6 @@
 #ifndef GC_H_
 #define GC_H_
 
-#include <seg_manager.h>
 #include <reg_t_hashmap.h>
 #include <engine.h>
 

diff --git a/src/engine/heap.c b/src/engine/heap.c
@@ -4,7 +4,7 @@
 
 #include <engine.h>
 #include <console.h>
-#include <heap.h>
+#include "heap.h"
 
 #define assert_in_range(pos) assert(pos>=1000 && pos<=0xffff)
 

diff --git a/src/include/heap.h → src/engine/heap.h b/src/include/heap.h → src/engine/heap.h
diff --git a/src/engine/kemu_old.c b/src/engine/kemu_old.c
@@ -27,9 +27,9 @@
 /* Emulation code for old kernel functions */
 
 #include <engine.h>
-#include <kernel_compat.h>
-#include <kernel_types.h>
-#include <heap.h>
+#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
@@ -25,15 +25,15 @@
 
 ***************************************************************************/
 
-#include <gc.h>
+#include "gc.h"
 #include <sciresource.h>
 #include <engine.h>
 #ifdef _WIN32
 #	include <windows.h>
 #endif /* _WIN32 */
 
 #include <gfx_operations.h>
-#include <kernel_types.h>
+#include "kernel_types.h"
 
 
 /* New kernel functions */

diff --git a/src/include/kernel_compat.h → src/engine/kernel_compat.h b/src/include/kernel_compat.h → src/engine/kernel_compat.h
diff --git a/src/include/kernel_types.h → src/engine/kernel_types.h b/src/include/kernel_types.h → src/engine/kernel_types.h
diff --git a/src/engine/kgraphics.c b/src/engine/kgraphics.c
@@ -28,7 +28,7 @@
 #include <sciresource.h>
 #include <engine.h>
 #include <gfx_widgets.h>
-#include <sci_graphics.h>
+#include "sci_graphics.h"
 #include <sci_widgets.h>
 
 #undef DEBUG_LSRECT

diff --git a/src/engine/kscripts.c b/src/engine/kscripts.c
@@ -27,7 +27,7 @@
 
 #include <sciresource.h>
 #include <engine.h>
-#include <kernel_types.h>
+#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
@@ -28,7 +28,7 @@
 
 #include <sciresource.h>
 #include <engine.h>
-#include <message.h>
+#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
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <message.h>
+#include "message.h"
 
 static
 int get_talker_trivial(index_record_cursor_t *cursor)

diff --git a/src/include/message.h → src/engine/message.h b/src/include/message.h → src/engine/message.h
diff --git a/src/engine/savegame.c b/src/engine/savegame.c
@@ -35,7 +35,7 @@
 #include <sfx_engine.h>
 #include <engine.h>
 #include <assert.h>
-#include <heap.h>
+#include "heap.h"
 
 #ifdef _MSC_VER
 #include <direct.h>

diff --git a/src/engine/savegame.cfsml b/src/engine/savegame.cfsml
@@ -35,7 +35,7 @@
 #include <sfx_engine.h>
 #include <engine.h>
 #include <assert.h>
-#include <heap.h>
+#include "heap.h"
 
 #ifdef _MSC_VER
 #include <direct.h>

diff --git a/src/include/sci_graphics.h → src/engine/sci_graphics.h b/src/include/sci_graphics.h → src/engine/sci_graphics.h
diff --git a/src/engine/scriptdebug.c b/src/engine/scriptdebug.c
@@ -25,13 +25,13 @@
 ***************************************************************************/
 /* Script debugger functionality. Absolutely not threadsafe. */
 
-#include <gc.h>
+#include "gc.h"
 #include <sciresource.h>
 #include <engine.h>
 #include <console.h>
 #include <kdebug.h>
 #include <vocabulary.h>
-#include <kernel_types.h>
+#include "kernel_types.h"
 #include <sci_midi.h>
 #include <sci_widgets.h>
 #include <reg_t_hashmap.h>

diff --git a/src/engine/vm.c b/src/engine/vm.c
@@ -29,9 +29,9 @@
 #include <engine.h>
 #include <versions.h>
 #include <kdebug.h>
-#include <kernel_types.h>
+#include "kernel_types.h"
 #include <seg_manager.h>
-#include <gc.h>
+#include "gc.h"
 #include <sfx_player.h>
 
 #ifdef HAVE_SETJMP_H

diff --git 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
@@ -54,7 +54,7 @@
 #error NOTE: This file MUST be compiled as C++. In Visual C++, use the /Tp command line option.
 #endif
 
-#include <graphics_directx.h>
+#include "dx_driver.h"
 
 #define TO_STRING2(x) #x
 #define TO_STRING(x) TO_STRING2(x)

diff --git a/src/include/graphics_directx.h → src/gfx/drivers/dx_driver.h b/src/include/graphics_directx.h → src/gfx/drivers/dx_driver.h
diff --git 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
@@ -41,7 +41,6 @@
 #include <versions.h>
 #include <kernel.h>
 #include <gfx_state_internal.h>
-#include <seg_manager.h>
 #include <sfx_engine.h>
 
 #define FREESCI_CURRENT_SAVEGAME_VERSION 7

diff --git 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 → src/scicore/exe.h b/src/include/exe.h → src/scicore/exe.h
diff --git a/src/include/exe_dec.h → src/scicore/exe_dec.h b/src/include/exe_dec.h → src/scicore/exe_dec.h
diff --git a/src/scicore/exe_lzexe.c b/src/scicore/exe_lzexe.c
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 #include <sci_memory.h>
-#include <exe_dec.h>
+#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
@@ -33,7 +33,7 @@ struct _exe_handle
 	FILE *f;
 };
 
-#include <exe_dec.h>
+#include "exe_dec.h"
 
 static exe_handle_t *
 raw_open(const char *filename)

diff --git a/src/include/games.h → src/scicore/games.h b/src/include/games.h → src/scicore/games.h
diff --git a/src/scicore/versions.c b/src/scicore/versions.c
@@ -23,8 +23,8 @@
 #include <engine.h>
 #include <resource.h>
 #include <ctype.h>
-#include <games.h>
-#include <exe.h>
+#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
@@ -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
@@ -17,7 +17,7 @@
 
 ***************************************************************************/
 
-#include <sfx_adlib.h>
+#include "adlib.h"
 
 adlib_instr adlib_sbi[96];
 

diff --git a/src/include/sfx_adlib.h → src/sfx/adlib.h b/src/include/sfx_adlib.h → src/sfx/adlib.h
diff --git a/src/sfx/core.c b/src/sfx/core.c
@@ -30,7 +30,7 @@
 #include <sfx_timer.h>
 #include <sfx_iterator_internal.h>
 #include <sfx_player.h>
-#include <sfx_mixer.h>
+#include "mixer.h"
 #include <sci_midi.h>
 
 

diff --git a/src/include/sfx_device.h → src/sfx/device.h b/src/include/sfx_device.h → src/sfx/device.h
diff --git a/src/sfx/device/alsa-midi.c b/src/sfx/device/alsa-midi.c
@@ -26,7 +26,7 @@
 ***************************************************************************/
 
 #include <sfx_engine.h>
-#include <sfx_device.h>
+#include "../device.h"
 #ifdef HAVE_ALSA
 
 #include <alsa/asoundlib.h>

diff --git 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 <proto/camd.h>
 #include <proto/dos.h>

diff --git a/src/sfx/device/devices.c b/src/sfx/device/devices.c
@@ -28,7 +28,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <sfx_device.h>
+#include "../device.h"
 #include <stdio.h>
 
 #ifndef SCUMMVM

diff --git a/src/sfx/device/unixraw-midi.c b/src/sfx/device/unixraw-midi.c
@@ -26,7 +26,7 @@
 ***************************************************************************/
 
 #include <sfx_engine.h>
-#include <sfx_device.h>
+#include "../device.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/include/sfx_mixer.h → src/sfx/mixer.h b/src/include/sfx_mixer.h → src/sfx/mixer.h
diff --git a/src/sfx/mixer/dc.c b/src/sfx/mixer/dc.c
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <sfx_mixer.h>
+#include "../mixer.h"
 #include <sci_memory.h>
 #include <dc/sound/sound.h>
 #include <stream.h>

diff --git a/src/sfx/mixer/mixers.c b/src/sfx/mixer/mixers.c
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <sfx_mixer.h>
+#include "../mixer.h"
 #include <resource.h>
 
 extern sfx_pcm_mixer_t sfx_pcm_mixer_soft_linear;

diff --git a/src/sfx/mixer/soft.c b/src/sfx/mixer/soft.c
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <sfx_mixer.h>
+#include "../mixer.h"
 #include <sci_memory.h>
 
 /* 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
@@ -27,7 +27,7 @@
 /* Mixer inspection/test program */
 
 
-#include <sfx_mixer.h>
+#include "../mixer.h"
 #include <time.h>
 
 #if 0

diff --git 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
@@ -28,7 +28,7 @@
 /* Based on ALSA's pcm.c example. */
 
 #include <sfx_pcm.h>
-#include <sfx_audiobuf.h>
+#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
@@ -27,7 +27,7 @@
 
 ***************************************************************************/
 
-#include <sfx_audiobuf.h>
+#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
@@ -25,7 +25,7 @@
 
 ***************************************************************************/
 
-#include <sfx_audiobuf.h>
+#include "audiobuf.h"
 
 #define NO_BUFFER_UNDERRUN		0
 #define SAW_BUFFER_UNDERRUN		1

diff --git a/src/include/sfx_audiobuf.h → src/sfx/pcm_device/audiobuf.h b/src/include/sfx_audiobuf.h → src/sfx/pcm_device/audiobuf.h
diff --git a/src/sfx/pcm_device/sdl.c b/src/sfx/pcm_device/sdl.c
@@ -19,7 +19,7 @@
 ***************************************************************************/
 
 #include <sfx_pcm.h>
-#include <sfx_audiobuf.h>
+#include "audiobuf.h"
 
 #ifdef HAVE_SDL