aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenSong.pas
diff options
context:
space:
mode:
authoreddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-01 19:34:40 +0000
committereddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-01 19:34:40 +0000
commit391d30716d48dc709f6444b19c008e82311623b9 (patch)
treee922181e99262c06e6d48a6df5cda71a2338e0bd /Game/Code/Screens/UScreenSong.pas
parent39c1fdef33f512a36334e689e38b90cfe4aceb82 (diff)
downloadusdx-391d30716d48dc709f6444b19c008e82311623b9.tar.gz
usdx-391d30716d48dc709f6444b19c008e82311623b9.tar.xz
usdx-391d30716d48dc709f6444b19c008e82311623b9.zip
Mac OS X version compiles and links. I hope I didn't break too many files on windows/linux.
Added switches.inc to all files. Changed many IFDEFs. For Windows-only code please use MSWINDOWS instead of WIN32 now. WIN32 is also used by the Mac port. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@546 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenSong.pas8
1 files changed, 2 insertions, 6 deletions
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 4d146283..3f2f5d58 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1,12 +1,8 @@
unit UScreenSong;
interface
-{$I switches.inc}
-
-{$IFDEF FPC}
- {$MODE DELPHI}
-{$ENDIF}
+{$I switches.inc}
uses
@@ -813,7 +809,7 @@ begin
try
AddButton(300 + Pet*250, 140, 200, 200, '', 'JPG', 'Plain', Theme.Song.Cover.Reflections);
except
- {$IFDEF win32}
+ {$IFDEF MSWINDOWS}
Messagebox(0, PChar('No Cover Image is damage. Could not Workaround Song Loading, Ultrastar will exit now.'), PChar(Language.Translate('US_VERSION')), MB_ICONERROR or MB_OK);
{$ELSE}
// TODO : JB_linux - better handle this message and display to user..