From 9aa48684216b0dca926fa7e68a1b843dc1a872ce Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 8 May 2008 17:57:26 +0000 Subject: - 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 --- Game/Code/switches.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Game/Code/switches.inc') diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc index c4285d32..e47c319d 100644 --- a/Game/Code/switches.inc +++ b/Game/Code/switches.inc @@ -8,8 +8,9 @@ // compiler/IDE dependent config {$IFDEF FPC} + {$H+} // use AnsiString instead of ShortString as String-type (default in Delphi) + {$IFDEF DARWIN} - {$H+} // enables usage of AnsiString as String-type {$R-} // disable range-checks (eddie: please test if this is still necessary) {$ENDIF} @@ -68,7 +69,6 @@ {$DEFINE CONSOLE} {$DEFINE HaveBASS} - {$DEFINE DLL_CDECL} {$DEFINE WIN32} {$DEFINE UTF8_FILENAMES} {$IFEND} -- cgit v1.2.3