mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build

release/0.4.5
tron 2005-07-25 07:16:10 +00:00
parent cb3c325e5f
commit 201990b5d9
30 changed files with 108 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -337,7 +337,6 @@ ifdef PROFILE
endif endif
CDEFS=-DWITH_REV CDEFS=-DWITH_REV
CFLAGS += -I. -I-
ifndef DEBUG ifndef DEBUG
ifndef PROFILE ifndef PROFILE

2
music/bemidi.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_BEMIDI_H #ifndef MUSIC_BEMIDI_H
#define MUSIC_BEMIDI_H #define MUSIC_BEMIDI_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _bemidi_music_driver; extern const HalMusicDriver _bemidi_music_driver;

12
music/dmusic.c
View File

@ -26,15 +26,15 @@
/* DirectMusic driver for Win32 */ /* DirectMusic driver for Win32 */
/* Based on dxmci from TTDPatch */ /* Based on dxmci from TTDPatch */
#include "stdafx.h" #include "../stdafx.h"
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
#include "openttd.h" #include "../openttd.h"
#include "string.h" #include "../string.h"
#include "variables.h" #include "../variables.h"
#include "sound.h" #include "../sound.h"
#include "music/dmusic.h" #include "dmusic.h"
static const char * DMusicMidiStart(const char * const *parm); static const char * DMusicMidiStart(const char * const *parm);
static void DMusicMidiStop(void); static void DMusicMidiStop(void);

2
music/dmusic.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_DMUSIC_H #ifndef MUSIC_DMUSIC_H
#define MUSIC_DMUSIC_H #define MUSIC_DMUSIC_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _dmusic_midi_driver; extern const HalMusicDriver _dmusic_midi_driver;

13
music/extmidi.c
View File

@ -2,13 +2,12 @@
#ifndef __BEOS__ #ifndef __BEOS__
#ifndef __MORPHOS__ #ifndef __MORPHOS__
#include "stdafx.h" #include "../stdafx.h"
#include "../openttd.h"
#include "openttd.h" #include "../sound.h"
#include "music/extmidi.h" #include "../string.h"
#include "sound.h" #include "../variables.h"
#include "string.h" #include "extmidi.h"
#include "variables.h"
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>

2
music/extmidi.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_EXTERNAL_H #ifndef MUSIC_EXTERNAL_H
#define MUSIC_EXTERNAL_H #define MUSIC_EXTERNAL_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _extmidi_music_driver; extern const HalMusicDriver _extmidi_music_driver;

6
music/null_m.c
View File

@ -1,8 +1,8 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "music/null_m.h" #include "null_m.h"
static const char* NullMidiStart(const char* const* parm) { return NULL; } static const char* NullMidiStart(const char* const* parm) { return NULL; }
static void NullMidiStop(void) {} static void NullMidiStop(void) {}

2
music/null_m.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_NULL_H #ifndef MUSIC_NULL_H
#define MUSIC_NULL_H #define MUSIC_NULL_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _null_music_driver; extern const HalMusicDriver _null_music_driver;

6
music/os2_m.c
View File

@ -1,8 +1,8 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "music/os2_m.h" #include "os2_m.h"
#define INCL_DOS #define INCL_DOS
#define INCL_OS2MM #define INCL_OS2MM

2
music/os2_m.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_OS2_H #ifndef MUSIC_OS2_H
#define MUSIC_OS2_H #define MUSIC_OS2_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _os2_music_driver; extern const HalMusicDriver _os2_music_driver;

7
music/win32_m.c
View File

@ -1,9 +1,10 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "music/win32_m.h" #include "win32_m.h"
#include <windows.h> #include <windows.h>
#include <mmsystem.h>
static struct { static struct {
bool stop_song; bool stop_song;

2
music/win32_m.h
View File

@ -3,7 +3,7 @@
#ifndef MUSIC_WIN32_H #ifndef MUSIC_WIN32_H
#define MUSIC_WIN32_H #define MUSIC_WIN32_H
#include "hal.h" #include "../hal.h"
extern const HalMusicDriver _win32_music_driver; extern const HalMusicDriver _win32_music_driver;

5
sdl.c
View File

@ -1,6 +1,9 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "stdafx.h"
#ifdef WITH_SDL
#include "openttd.h" #include "openttd.h"
#include "sdl.h" #include "sdl.h"
#include <SDL.h> #include <SDL.h>
@ -127,3 +130,5 @@ void SdlClose(uint32 x)
#endif #endif
} }
} }
#endif

6
sound/null_s.c
View File

@ -1,8 +1,8 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "sound/null_s.h" #include "null_s.h"
static const char *NullSoundStart(const char * const *parm) { return NULL; } static const char *NullSoundStart(const char * const *parm) { return NULL; }
static void NullSoundStop(void) {} static void NullSoundStop(void) {}

2
sound/null_s.h
View File

@ -3,7 +3,7 @@
#ifndef SOUND_NULL_H #ifndef SOUND_NULL_H
#define SOUND_NULL_H #define SOUND_NULL_H
#include "hal.h" #include "../hal.h"
extern const HalSoundDriver _null_sound_driver; extern const HalSoundDriver _null_sound_driver;

17
sound/sdl_s.c
View File

@ -1,11 +1,14 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h"
#include "driver.h" #ifdef WITH_SDL
#include "mixer.h"
#include "sdl.h" #include "../openttd.h"
#include "sound/sdl_s.h" #include "../driver.h"
#include "../mixer.h"
#include "../sdl.h"
#include "sdl_s.h"
#include <SDL.h> #include <SDL.h>
static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len) static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
@ -40,3 +43,5 @@ const HalSoundDriver _sdl_sound_driver = {
SdlSoundStart, SdlSoundStart,
SdlSoundStop, SdlSoundStop,
}; };
#endif

2
sound/sdl_s.h
View File

@ -3,7 +3,7 @@
#ifndef SOUND_SDL_H #ifndef SOUND_SDL_H
#define SOUND_SDL_H #define SOUND_SDL_H
#include "hal.h" #include "../hal.h"
extern const HalSoundDriver _sdl_sound_driver; extern const HalSoundDriver _sdl_sound_driver;

13
sound/win32_s.c
View File

@ -1,12 +1,13 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "driver.h" #include "../driver.h"
#include "functions.h" #include "../functions.h"
#include "mixer.h" #include "../mixer.h"
#include "sound/win32_s.h" #include "win32_s.h"
#include <windows.h> #include <windows.h>
#include <mmsystem.h>
static HWAVEOUT _waveout; static HWAVEOUT _waveout;
static WAVEHDR _wave_hdr[2]; static WAVEHDR _wave_hdr[2];

2
sound/win32_s.h
View File

@ -3,7 +3,7 @@
#ifndef SOUND_WIN32_H #ifndef SOUND_WIN32_H
#define SOUND_WIN32_H #define SOUND_WIN32_H
#include "hal.h" #include "../hal.h"
extern const HalSoundDriver _win32_sound_driver; extern const HalSoundDriver _win32_sound_driver;

2
table/engines.h
View File

@ -7,7 +7,7 @@
* This file contains all the data for vehicles * This file contains all the data for vehicles
*/ */
#include "sound.h" #include "../sound.h"
/** Writes the properties of a vehicle into the EngineInfo struct. /** Writes the properties of a vehicle into the EngineInfo struct.
* @see EngineInfo * @see EngineInfo

4
table/namegen.h
View File

@ -1,7 +1,7 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
static const char *name_original_english_1[] = { static const char *name_original_english_1[] = {
"Great ", "Great ",

22
video/dedicated_v.c
View File

@ -1,19 +1,19 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "debug.h" #include "dedicated_v.h"
#include "functions.h"
#include "network.h"
#include "video/dedicated_v.h"
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
#include "gfx.h" #include "../debug.h"
#include "window.h" #include "../functions.h"
#include "command.h" #include "../gfx.h"
#include "console.h" #include "../network.h"
#include "variables.h" #include "../window.h"
#include "../command.h"
#include "../console.h"
#include "../variables.h"
#ifdef __OS2__ #ifdef __OS2__
# include <sys/time.h> /* gettimeofday */ # include <sys/time.h> /* gettimeofday */

2
video/dedicated_v.h
View File

@ -3,7 +3,7 @@
#ifndef VIDEO_DEDICATED_H #ifndef VIDEO_DEDICATED_H
#define VIDEO_DEDICATED_H #define VIDEO_DEDICATED_H
#include "hal.h" #include "../hal.h"
extern const HalVideoDriver _dedicated_video_driver; extern const HalVideoDriver _dedicated_video_driver;

12
video/null_v.c
View File

@ -1,11 +1,11 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "gfx.h" #include "../gfx.h"
#include "variables.h" #include "../variables.h"
#include "video/null_v.h" #include "../window.h"
#include "window.h" #include "null_v.h"
static void* _null_video_mem = NULL; static void* _null_video_mem = NULL;

2
video/null_v.h
View File

@ -3,7 +3,7 @@
#ifndef VIDEO_NULL_H #ifndef VIDEO_NULL_H
#define VIDEO_NULL_H #define VIDEO_NULL_H
#include "hal.h" #include "../hal.h"
extern const HalVideoDriver _null_video_driver; extern const HalVideoDriver _null_video_driver;

27
video/sdl_v.c
View File

@ -1,17 +1,20 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h"
#include "debug.h" #ifdef WITH_SDL
#include "functions.h"
#include "gfx.h" #include "../openttd.h"
#include "macros.h" #include "../debug.h"
#include "sdl.h" #include "../functions.h"
#include "window.h" #include "../gfx.h"
#include "video/sdl_v.h" #include "../macros.h"
#include "../sdl.h"
#include "../window.h"
#include "../network.h"
#include "../variables.h"
#include "sdl_v.h"
#include <SDL.h> #include <SDL.h>
#include "network.h"
#include "variables.h"
static SDL_Surface *_sdl_screen; static SDL_Surface *_sdl_screen;
static bool _all_modes; static bool _all_modes;
@ -488,3 +491,5 @@ const HalVideoDriver _sdl_video_driver = {
SdlVideoChangeRes, SdlVideoChangeRes,
SdlVideoFullScreen, SdlVideoFullScreen,
}; };
#endif

2
video/sdl_v.h
View File

@ -3,7 +3,7 @@
#ifndef VIDEO_SDL_H #ifndef VIDEO_SDL_H
#define VIDEO_SDL_H #define VIDEO_SDL_H
#include "hal.h" #include "../hal.h"
extern const HalVideoDriver _sdl_video_driver; extern const HalVideoDriver _sdl_video_driver;

18
video/win32_v.c
View File

@ -1,14 +1,14 @@
/* $Id$ */ /* $Id$ */
#include "stdafx.h" #include "../stdafx.h"
#include "openttd.h" #include "../openttd.h"
#include "functions.h" #include "../functions.h"
#include "gfx.h" #include "../gfx.h"
#include "macros.h" #include "../macros.h"
#include "network.h" #include "../network.h"
#include "variables.h" #include "../variables.h"
#include "window.h" #include "../window.h"
#include "video/win32_v.h" #include "win32_v.h"
#include <windows.h> #include <windows.h>
static struct { static struct {

2
video/win32_v.h
View File

@ -3,7 +3,7 @@
#ifndef VIDEO_WIN32_H #ifndef VIDEO_WIN32_H
#define VIDEO_WIN32_H #define VIDEO_WIN32_H
#include "hal.h" #include "../hal.h"
bool MyShowCursor(bool show); bool MyShowCursor(bool show);

7
win32.c
View File

@ -25,17 +25,14 @@
#include "music/win32_m.h" #include "music/win32_m.h"
#include "sound/null_s.h" #include "sound/null_s.h"
#include "sound/sdl_s.h"
#include "sound/win32_s.h" #include "sound/win32_s.h"
#include "video/dedicated_v.h" #include "video/dedicated_v.h"
#include "video/null_v.h" #include "video/null_v.h"
#include "video/sdl_v.h"
#include "video/win32_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; static bool _has_console;
#if defined(__MINGW32__) || defined(__CYGWIN__) #if defined(__MINGW32__) || defined(__CYGWIN__)