cpp/openttd-patchpack/source Changeset - r2189:2faee8988cf3

Changeset - r2189:2faee8988cf3

Parent rev.

Child rev.

[Not reviewed]

master

0 30 0

tron - 19 years ago 2005-07-25 07:16:10
tron@openttd.org

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

30 files changed with 108 insertions and 96 deletions:

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

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -334,13 +334,12 @@ endif @@
 ifdef PROFILE
   CFLAGS += -pg
   LDFLAGS += -pg
 endif
 CDEFS=-DWITH_REV
 CFLAGS += -I. -I-
 ifndef DEBUG
 ifndef PROFILE
 # Release mode
 ifndef MORPHOS
 ifndef IRIX

music/bemidi.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_BEMIDI_H
 #define MUSIC_BEMIDI_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _bemidi_music_driver;
 #endif

music/dmusic.c

➞

Show inline comments

@@ @@ -23,21 +23,21 @@ @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 /* 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);
 static void DMusicMidiPlaySong(const char *filename);
 static void DMusicMidiStopSong(void);
 static bool DMusicMidiIsSongPlaying(void);

music/dmusic.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_DMUSIC_H
 #define MUSIC_DMUSIC_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _dmusic_midi_driver;
 #endif

music/extmidi.c

➞

Show inline comments

 /* $Id$ */
 #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>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/stat.h>

music/extmidi.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_EXTERNAL_H
 #define MUSIC_EXTERNAL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _extmidi_music_driver;
 #endif

music/null_m.c

➞

Show inline comments

 /* $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) {}
 static void NullMidiPlaySong(const char *filename) {}
 static void NullMidiStopSong(void) {}
 static bool NullMidiIsSongPlaying(void) { return true; }

music/null_m.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_NULL_H
 #define MUSIC_NULL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _null_music_driver;
 #endif

music/os2_m.c

➞

Show inline comments

 /* $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
 #define INCL_WIN
 #include <stdarg.h>

music/os2_m.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_OS2_H
 #define MUSIC_OS2_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _os2_music_driver;
 #endif

music/win32_m.c

➞

Show inline comments

 /* $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;
 	bool terminate;
 	bool playing;
 	int new_vol;

music/win32_m.h

➞

Show inline comments

 /* $Id$ */
 #ifndef MUSIC_WIN32_H
 #define MUSIC_WIN32_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalMusicDriver _win32_music_driver;
 #endif

sdl.c

➞

Show inline comments

 /* $Id$ */
 #include "stdafx.h"
 #ifdef WITH_SDL
 #include "openttd.h"
 #include "sdl.h"
 #include <SDL.h>
 #ifdef UNIX
 #include <signal.h>
@@ @@ -124,6 +127,8 @@ void SdlClose(uint32 x) @@
 		signal(SIGABRT, SIG_DFL);
 		signal(SIGSEGV, SIG_DFL);
 		signal(SIGFPE, SIG_DFL);
 		#endif
+	}
+}
 #endif

sound/null_s.c

➞

Show inline comments

 /* $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) {}
 const HalSoundDriver _null_sound_driver = {
 	NullSoundStart,

sound/null_s.h

➞

Show inline comments

 /* $Id$ */
 #ifndef SOUND_NULL_H
 #define SOUND_NULL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalSoundDriver _null_sound_driver;
 #endif

sound/sdl_s.c

➞

Show inline comments

 /* $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)
+{
 	MxMixSamples(_mixer, stream, len / 4);
+}
@@ @@ -37,6 +40,8 @@ static void SdlSoundStop(void) @@
+}
 const HalSoundDriver _sdl_sound_driver = {
 	SdlSoundStart,
 	SdlSoundStop,
 };
 #endif

sound/sdl_s.h

➞

Show inline comments

 /* $Id$ */
 #ifndef SOUND_SDL_H
 #define SOUND_SDL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalSoundDriver _sdl_sound_driver;
 #endif

sound/win32_s.c

➞

Show inline comments

 /* $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];
 static int _bufsize;
 static void PrepareHeader(WAVEHDR *hdr)

sound/win32_s.h

➞

Show inline comments

 /* $Id$ */
 #ifndef SOUND_WIN32_H
 #define SOUND_WIN32_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalSoundDriver _win32_sound_driver;
 #endif

table/engines.h

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 #define ENGINES_H
 /** @file table/engines.h
   * 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
   * @param a Introduction date
   * @param e Rail Type of the vehicle
   * @param f Bitmask of the climates

table/namegen.h

➞

Show inline comments

 /* $Id$ */
 #include "stdafx.h"
 #include "openttd.h"
 #include "../stdafx.h"
 #include "../openttd.h"
 static const char *name_original_english_1[] = {
 	"Great ",
 	"Little ",
 	"New ",
 	"Fort ",

video/dedicated_v.c

➞

Show inline comments

 /* $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 */
 #	include <sys/types.h>
 #	include <unistd.h>
 #	include <conio.h>

video/dedicated_v.h

➞

Show inline comments

 /* $Id$ */
 #ifndef VIDEO_DEDICATED_H
 #define VIDEO_DEDICATED_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalVideoDriver _dedicated_video_driver;
 #endif

video/null_v.c

➞

Show inline comments

 /* $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;
 static const char* NullVideoStart(const char* const* parm)
+{
 	_screen.width = _screen.pitch = _cur_resolution[0];

video/null_v.h

➞

Show inline comments

 /* $Id$ */
 #ifndef VIDEO_NULL_H
 #define VIDEO_NULL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalVideoDriver _null_video_driver;
 #endif

video/sdl_v.c

➞

Show inline comments

 /* $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;
 #define MAX_DIRTY_RECTS 100
 static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS];
@@ @@ -485,6 +488,8 @@ const HalVideoDriver _sdl_video_driver = @@
 	SdlVideoStop,
 	SdlVideoMakeDirty,
 	SdlVideoMainLoop,
 	SdlVideoChangeRes,
 	SdlVideoFullScreen,
 };
 #endif

video/sdl_v.h

➞

Show inline comments

 /* $Id$ */
 #ifndef VIDEO_SDL_H
 #define VIDEO_SDL_H
 #include "hal.h"
+#include "../hal.h"
 extern const HalVideoDriver _sdl_video_driver;
 #endif

video/win32_v.c

➞

Show inline comments

 /* $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 {
 	HWND main_wnd;
 	HBITMAP dib_sect;
 	Pixel *bitmap_bits;

video/win32_v.h

➞

Show inline comments

 /* $Id$ */
 #ifndef VIDEO_WIN32_H
 #define VIDEO_WIN32_H
 #include "hal.h"
+#include "../hal.h"
 bool MyShowCursor(bool show);
 extern const HalVideoDriver _win32_video_driver;
 #endif

win32.c

➞

Show inline comments

@@ @@ -22,23 +22,20 @@ @@
 #include "music/dmusic.h"
 #include "music/null_m.h"
 #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__)
 	#define __TIMESTAMP__   __DATE__ __TIME__
 #endif

0 comments (0 inline, 0 general)