petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
tron
2005-07-25 07:16:10 +00:00
parent cb3c325e5f
commit 201990b5d9
30 changed files with 108 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
music/bemidi.h
View File

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

12
music/dmusic.c
View File

@@ -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);

2
music/dmusic.h
View File

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

13
music/extmidi.c
View File

@@ -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>

2
music/extmidi.h
View File

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

6
music/null_m.c
View File

@@ -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) {}

2
music/null_m.h
View File

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

6
music/os2_m.c
View File

@@ -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

2
music/os2_m.h
View File

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

7
music/win32_m.c
View File

@@ -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;

2
music/win32_m.h
View File

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