diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-08 17:57:26 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-08 17:57:26 +0000 |
| commit | 9aa48684216b0dca926fa7e68a1b843dc1a872ce (patch) | |
| tree | b4b62b3ad8c815d048c7e6093f4b952a2086d346 /Game/Code/lib/midi | |
| parent | 0dd7fd1b3a6276a39699a00e72289f264b7fdd4f (diff) | |
| download | usdx-9aa48684216b0dca926fa7e68a1b843dc1a872ce.tar.gz usdx-9aa48684216b0dca926fa7e68a1b843dc1a872ce.tar.xz usdx-9aa48684216b0dca926fa7e68a1b843dc1a872ce.zip | |
- added the {$H+} switch for FPC (was introduced for the MacOSX before). This will use AnsiString (no length restriction and passed as pointer) instead of ShortString (= array[0..255] of Char). This is the standard in Delphi so we should use it in FPC too. The FPC reference doc states that {$H-} is standard in FPC, but for any reason in my FPC 2.2.0 for win {$H+} is standard. Maybe the reference guide is somewhat outdated, so probably nothing changed because H+ was the default already.
- removed DLL_CDECL from switches.inc and put it directly into the headers (used in bass and freeimage). Libs shouldn't be declared STDCALL or CDECL globally because it depends on how the libs are compiled. For windows, STDCALL and CDECL are possible, so please define this on a per library base.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1069 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/lib/midi')
| -rw-r--r-- | Game/Code/lib/midi/CIRCBUF.PAS | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/DELPHMCB.PAS | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/MIDIDEFS.PAS | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/MIDITYPE.PAS | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/MidiFile.pas | 1 | ||||
| -rw-r--r-- | Game/Code/lib/midi/MidiScope.pas | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/Midicons.pas | 5 | ||||
| -rw-r--r-- | Game/Code/lib/midi/Midiin.pas | 1 | ||||
| -rw-r--r-- | Game/Code/lib/midi/Midiout.pas | 1 |
9 files changed, 33 insertions, 0 deletions
diff --git a/Game/Code/lib/midi/CIRCBUF.PAS b/Game/Code/lib/midi/CIRCBUF.PAS index 9f1f8390..c741230e 100644 --- a/Game/Code/lib/midi/CIRCBUF.PAS +++ b/Game/Code/lib/midi/CIRCBUF.PAS @@ -21,6 +21,11 @@ Unit Circbuf; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
Uses
Windows,
MMSystem;
diff --git a/Game/Code/lib/midi/DELPHMCB.PAS b/Game/Code/lib/midi/DELPHMCB.PAS index e8b732fa..5d4ad75a 100644 --- a/Game/Code/lib/midi/DELPHMCB.PAS +++ b/Game/Code/lib/midi/DELPHMCB.PAS @@ -9,6 +9,11 @@ unit Delphmcb; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
uses
Windows,
MMsystem,
diff --git a/Game/Code/lib/midi/MIDIDEFS.PAS b/Game/Code/lib/midi/MIDIDEFS.PAS index 8e351a07..e97a8627 100644 --- a/Game/Code/lib/midi/MIDIDEFS.PAS +++ b/Game/Code/lib/midi/MIDIDEFS.PAS @@ -11,6 +11,11 @@ unit Mididefs; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
uses
Windows,
MMsystem,
diff --git a/Game/Code/lib/midi/MIDITYPE.PAS b/Game/Code/lib/midi/MIDITYPE.PAS index 18d05ec4..a4166c42 100644 --- a/Game/Code/lib/midi/MIDITYPE.PAS +++ b/Game/Code/lib/midi/MIDITYPE.PAS @@ -8,6 +8,11 @@ unit Miditype; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
uses
Classes,
Windows,
diff --git a/Game/Code/lib/midi/MidiFile.pas b/Game/Code/lib/midi/MidiFile.pas index 0c150a8b..2da052f4 100644 --- a/Game/Code/lib/midi/MidiFile.pas +++ b/Game/Code/lib/midi/MidiFile.pas @@ -92,6 +92,7 @@ interface {$IFDEF FPC}
{$MODE Delphi}
+ {$H+} // use AnsiString
{$ENDIF}
uses
diff --git a/Game/Code/lib/midi/MidiScope.pas b/Game/Code/lib/midi/MidiScope.pas index 0caa430f..43efc4e8 100644 --- a/Game/Code/lib/midi/MidiScope.pas +++ b/Game/Code/lib/midi/MidiScope.pas @@ -18,6 +18,11 @@ unit MidiScope; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
uses
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs;
diff --git a/Game/Code/lib/midi/Midicons.pas b/Game/Code/lib/midi/Midicons.pas index 41dda9e1..45bae463 100644 --- a/Game/Code/lib/midi/Midicons.pas +++ b/Game/Code/lib/midi/Midicons.pas @@ -9,6 +9,11 @@ unit Midicons; interface
+{$IFDEF FPC}
+ {$MODE Delphi}
+ {$H+} // use AnsiString
+{$ENDIF}
+
uses Messages;
const
diff --git a/Game/Code/lib/midi/Midiin.pas b/Game/Code/lib/midi/Midiin.pas index 8cb7beb7..a122bcb0 100644 --- a/Game/Code/lib/midi/Midiin.pas +++ b/Game/Code/lib/midi/Midiin.pas @@ -103,6 +103,7 @@ interface {$IFDEF FPC}
{$MODE Delphi}
+ {$H+} // use AnsiString
{$ENDIF}
uses
diff --git a/Game/Code/lib/midi/Midiout.pas b/Game/Code/lib/midi/Midiout.pas index cdbc762d..81b00e9f 100644 --- a/Game/Code/lib/midi/Midiout.pas +++ b/Game/Code/lib/midi/Midiout.pas @@ -98,6 +98,7 @@ interface {$IFDEF FPC}
{$MODE Delphi}
+ {$H+} // use AnsiString
{$ENDIF}
uses
|