Mercurial > hg > openttd
changeset 2189:c91103115fd1 draft
(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
| author | tron <tron@openttd.org> |
|---|---|
| date | Mon, 25 Jul 2005 07:16:10 +0000 |
| parents | 8d6b24c1eec7 |
| children | 148c96f95fdd |
| files | Makefile music/bemidi.h music/dmusic.c music/dmusic.h music/extmidi.c music/extmidi.h music/null_m.c music/null_m.h music/os2_m.c music/os2_m.h music/win32_m.c music/win32_m.h sdl.c sound/null_s.c sound/null_s.h sound/sdl_s.c sound/sdl_s.h sound/win32_s.c sound/win32_s.h table/engines.h table/namegen.h video/dedicated_v.c video/dedicated_v.h video/null_v.c video/null_v.h video/sdl_v.c video/sdl_v.h video/win32_v.c video/win32_v.h win32.c |
| diffstat | 30 files changed, 108 insertions(+), 96 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile +++ b/Makefile @@ -337,7 +337,6 @@ endif CDEFS=-DWITH_REV -CFLAGS += -I. -I- ifndef DEBUG ifndef PROFILE
--- a/music/bemidi.h +++ b/music/bemidi.h @@ -3,7 +3,7 @@ #ifndef MUSIC_BEMIDI_H #define MUSIC_BEMIDI_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _bemidi_music_driver;
--- a/music/dmusic.c +++ b/music/dmusic.c @@ -26,15 +26,15 @@ /* DirectMusic driver for Win32 */ /* Based on dxmci from TTDPatch */ -#include "stdafx.h" +#include "../stdafx.h" #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT -#include "openttd.h" -#include "string.h" -#include "variables.h" -#include "sound.h" -#include "music/dmusic.h" +#include "../openttd.h" +#include "../string.h" +#include "../variables.h" +#include "../sound.h" +#include "dmusic.h" static const char * DMusicMidiStart(const char * const *parm); static void DMusicMidiStop(void);
--- a/music/dmusic.h +++ b/music/dmusic.h @@ -3,7 +3,7 @@ #ifndef MUSIC_DMUSIC_H #define MUSIC_DMUSIC_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _dmusic_midi_driver;
--- a/music/extmidi.c +++ b/music/extmidi.c @@ -2,13 +2,12 @@ #ifndef __BEOS__ #ifndef __MORPHOS__ -#include "stdafx.h" - -#include "openttd.h" -#include "music/extmidi.h" -#include "sound.h" -#include "string.h" -#include "variables.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "../sound.h" +#include "../string.h" +#include "../variables.h" +#include "extmidi.h" #include <fcntl.h> #include <sys/types.h> #include <sys/wait.h>
--- a/music/extmidi.h +++ b/music/extmidi.h @@ -3,7 +3,7 @@ #ifndef MUSIC_EXTERNAL_H #define MUSIC_EXTERNAL_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _extmidi_music_driver;
--- a/music/null_m.c +++ b/music/null_m.c @@ -1,8 +1,8 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "music/null_m.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "null_m.h" static const char* NullMidiStart(const char* const* parm) { return NULL; } static void NullMidiStop(void) {}
--- a/music/null_m.h +++ b/music/null_m.h @@ -3,7 +3,7 @@ #ifndef MUSIC_NULL_H #define MUSIC_NULL_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _null_music_driver;
--- a/music/os2_m.c +++ b/music/os2_m.c @@ -1,8 +1,8 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "music/os2_m.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "os2_m.h" #define INCL_DOS #define INCL_OS2MM
--- a/music/os2_m.h +++ b/music/os2_m.h @@ -3,7 +3,7 @@ #ifndef MUSIC_OS2_H #define MUSIC_OS2_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _os2_music_driver;
--- a/music/win32_m.c +++ b/music/win32_m.c @@ -1,9 +1,10 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "music/win32_m.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "win32_m.h" #include <windows.h> +#include <mmsystem.h> static struct { bool stop_song;
--- a/music/win32_m.h +++ b/music/win32_m.h @@ -3,7 +3,7 @@ #ifndef MUSIC_WIN32_H #define MUSIC_WIN32_H -#include "hal.h" +#include "../hal.h" extern const HalMusicDriver _win32_music_driver;
--- a/sdl.c +++ b/sdl.c @@ -1,6 +1,9 @@ /* $Id$ */ #include "stdafx.h" + +#ifdef WITH_SDL + #include "openttd.h" #include "sdl.h" #include <SDL.h> @@ -127,3 +130,5 @@ #endif } } + +#endif
--- a/sound/null_s.c +++ b/sound/null_s.c @@ -1,8 +1,8 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "sound/null_s.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "null_s.h" static const char *NullSoundStart(const char * const *parm) { return NULL; } static void NullSoundStop(void) {}
--- a/sound/null_s.h +++ b/sound/null_s.h @@ -3,7 +3,7 @@ #ifndef SOUND_NULL_H #define SOUND_NULL_H -#include "hal.h" +#include "../hal.h" extern const HalSoundDriver _null_sound_driver;
--- a/sound/sdl_s.c +++ b/sound/sdl_s.c @@ -1,11 +1,14 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "driver.h" -#include "mixer.h" -#include "sdl.h" -#include "sound/sdl_s.h" +#include "../stdafx.h" + +#ifdef WITH_SDL + +#include "../openttd.h" +#include "../driver.h" +#include "../mixer.h" +#include "../sdl.h" +#include "sdl_s.h" #include <SDL.h> static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) @@ -40,3 +43,5 @@ SdlSoundStart, SdlSoundStop, }; + +#endif
--- a/sound/sdl_s.h +++ b/sound/sdl_s.h @@ -3,7 +3,7 @@ #ifndef SOUND_SDL_H #define SOUND_SDL_H -#include "hal.h" +#include "../hal.h" extern const HalSoundDriver _sdl_sound_driver;
--- a/sound/win32_s.c +++ b/sound/win32_s.c @@ -1,12 +1,13 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "driver.h" -#include "functions.h" -#include "mixer.h" -#include "sound/win32_s.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "../driver.h" +#include "../functions.h" +#include "../mixer.h" +#include "win32_s.h" #include <windows.h> +#include <mmsystem.h> static HWAVEOUT _waveout; static WAVEHDR _wave_hdr[2];
--- a/sound/win32_s.h +++ b/sound/win32_s.h @@ -3,7 +3,7 @@ #ifndef SOUND_WIN32_H #define SOUND_WIN32_H -#include "hal.h" +#include "../hal.h" extern const HalSoundDriver _win32_sound_driver;
--- a/table/engines.h +++ b/table/engines.h @@ -7,7 +7,7 @@ * This file contains all the data for vehicles */ -#include "sound.h" +#include "../sound.h" /** Writes the properties of a vehicle into the EngineInfo struct. * @see EngineInfo
--- a/table/namegen.h +++ b/table/namegen.h @@ -1,7 +1,7 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" +#include "../stdafx.h" +#include "../openttd.h" static const char *name_original_english_1[] = { "Great ",
--- a/video/dedicated_v.c +++ b/video/dedicated_v.c @@ -1,19 +1,19 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "debug.h" -#include "functions.h" -#include "network.h" -#include "video/dedicated_v.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "dedicated_v.h" #ifdef ENABLE_NETWORK -#include "gfx.h" -#include "window.h" -#include "command.h" -#include "console.h" -#include "variables.h" +#include "../debug.h" +#include "../functions.h" +#include "../gfx.h" +#include "../network.h" +#include "../window.h" +#include "../command.h" +#include "../console.h" +#include "../variables.h" #ifdef __OS2__ # include <sys/time.h> /* gettimeofday */
--- a/video/dedicated_v.h +++ b/video/dedicated_v.h @@ -3,7 +3,7 @@ #ifndef VIDEO_DEDICATED_H #define VIDEO_DEDICATED_H -#include "hal.h" +#include "../hal.h" extern const HalVideoDriver _dedicated_video_driver;
--- a/video/null_v.c +++ b/video/null_v.c @@ -1,11 +1,11 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "gfx.h" -#include "variables.h" -#include "video/null_v.h" -#include "window.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "../gfx.h" +#include "../variables.h" +#include "../window.h" +#include "null_v.h" static void* _null_video_mem = NULL;
--- a/video/null_v.h +++ b/video/null_v.h @@ -3,7 +3,7 @@ #ifndef VIDEO_NULL_H #define VIDEO_NULL_H -#include "hal.h" +#include "../hal.h" extern const HalVideoDriver _null_video_driver;
--- a/video/sdl_v.c +++ b/video/sdl_v.c @@ -1,17 +1,20 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "debug.h" -#include "functions.h" -#include "gfx.h" -#include "macros.h" -#include "sdl.h" -#include "window.h" -#include "video/sdl_v.h" +#include "../stdafx.h" + +#ifdef WITH_SDL + +#include "../openttd.h" +#include "../debug.h" +#include "../functions.h" +#include "../gfx.h" +#include "../macros.h" +#include "../sdl.h" +#include "../window.h" +#include "../network.h" +#include "../variables.h" +#include "sdl_v.h" #include <SDL.h> -#include "network.h" -#include "variables.h" static SDL_Surface *_sdl_screen; static bool _all_modes; @@ -488,3 +491,5 @@ SdlVideoChangeRes, SdlVideoFullScreen, }; + +#endif
--- a/video/sdl_v.h +++ b/video/sdl_v.h @@ -3,7 +3,7 @@ #ifndef VIDEO_SDL_H #define VIDEO_SDL_H -#include "hal.h" +#include "../hal.h" extern const HalVideoDriver _sdl_video_driver;
--- a/video/win32_v.c +++ b/video/win32_v.c @@ -1,14 +1,14 @@ /* $Id$ */ -#include "stdafx.h" -#include "openttd.h" -#include "functions.h" -#include "gfx.h" -#include "macros.h" -#include "network.h" -#include "variables.h" -#include "window.h" -#include "video/win32_v.h" +#include "../stdafx.h" +#include "../openttd.h" +#include "../functions.h" +#include "../gfx.h" +#include "../macros.h" +#include "../network.h" +#include "../variables.h" +#include "../window.h" +#include "win32_v.h" #include <windows.h> static struct {
--- a/video/win32_v.h +++ b/video/win32_v.h @@ -3,7 +3,7 @@ #ifndef VIDEO_WIN32_H #define VIDEO_WIN32_H -#include "hal.h" +#include "../hal.h" bool MyShowCursor(bool show);
--- a/win32.c +++ b/win32.c @@ -25,17 +25,14 @@ #include "music/win32_m.h" #include "sound/null_s.h" +#include "sound/sdl_s.h" #include "sound/win32_s.h" #include "video/dedicated_v.h" #include "video/null_v.h" +#include "video/sdl_v.h" #include "video/win32_v.h" -#ifdef WITH_SDL - #include "sound/sdl_s.h" - #include "video/sdl_v.h" -#endif - static bool _has_console; #if defined(__MINGW32__) || defined(__CYGWIN__)