- switches.inc removed from ModiSDK.pas and StrUtils.pas as the plugins do not find it

- FPC compatibility (Assembler mode set, Mode-delphi set, ...)
- Plugin "Don't get worse" updated for USDX 1.1 compatibility
- Other plugins need to be updated too. Perhaps include them to the main project later.

Note that the party mode is disabled at the moment so plugins will not work.


git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1499 b956fd51-792f-4845-bead-9b4dfca2ff2c

5 files changed, 294 insertions, 8 deletions

diff --git a/plugins/Don't_Get_Worse/Hold_The_Line.bdsproj b/plugins/Don't_Get_Worse/Hold_The_Line.bdsproj
new file mode 100644
index 00000000..f4b61402
--- /dev/null
+++ b/plugins/Don't_Get_Worse/Hold_The_Line.bdsproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">Delphi.Personality</Option>

+      <Option Name="ProjectType">VCLApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{06A9B812-7EBB-46A7-A56A-6DE18E64E79D}</Option>

+    </Option>

+  </PersonalityInfo>

+  <Delphi.Personality>

+    <Source>

+      <Source Name="MainSource">Hold_The_Line.dpr</Source>

+    </Source>

+    <FileVersion>

+      <FileVersion Name="Version">7.0</FileVersion>

+    </FileVersion>

+    <Compiler>

+      <Compiler Name="A">8</Compiler>

+      <Compiler Name="B">0</Compiler>

+      <Compiler Name="C">1</Compiler>

+      <Compiler Name="D">1</Compiler>

+      <Compiler Name="E">0</Compiler>

+      <Compiler Name="F">0</Compiler>

+      <Compiler Name="G">1</Compiler>

+      <Compiler Name="H">1</Compiler>

+      <Compiler Name="I">1</Compiler>

+      <Compiler Name="J">0</Compiler>

+      <Compiler Name="K">0</Compiler>

+      <Compiler Name="L">1</Compiler>

+      <Compiler Name="M">0</Compiler>

+      <Compiler Name="N">1</Compiler>

+      <Compiler Name="O">1</Compiler>

+      <Compiler Name="P">1</Compiler>

+      <Compiler Name="Q">0</Compiler>

+      <Compiler Name="R">0</Compiler>

+      <Compiler Name="S">0</Compiler>

+      <Compiler Name="T">0</Compiler>

+      <Compiler Name="U">0</Compiler>

+      <Compiler Name="V">1</Compiler>

+      <Compiler Name="W">0</Compiler>

+      <Compiler Name="X">1</Compiler>

+      <Compiler Name="Y">1</Compiler>

+      <Compiler Name="Z">1</Compiler>

+      <Compiler Name="ShowHints">True</Compiler>

+      <Compiler Name="ShowWarnings">True</Compiler>

+      <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>

+      <Compiler Name="NamespacePrefix"></Compiler>

+      <Compiler Name="GenerateDocumentation">False</Compiler>

+      <Compiler Name="DefaultNamespace"></Compiler>

+      <Compiler Name="SymbolDeprecated">True</Compiler>

+      <Compiler Name="SymbolLibrary">True</Compiler>

+      <Compiler Name="SymbolPlatform">True</Compiler>

+      <Compiler Name="SymbolExperimental">True</Compiler>

+      <Compiler Name="UnitLibrary">True</Compiler>

+      <Compiler Name="UnitPlatform">True</Compiler>

+      <Compiler Name="UnitDeprecated">True</Compiler>

+      <Compiler Name="UnitExperimental">True</Compiler>

+      <Compiler Name="HResultCompat">True</Compiler>

+      <Compiler Name="HidingMember">True</Compiler>

+      <Compiler Name="HiddenVirtual">True</Compiler>

+      <Compiler Name="Garbage">True</Compiler>

+      <Compiler Name="BoundsError">True</Compiler>

+      <Compiler Name="ZeroNilCompat">True</Compiler>

+      <Compiler Name="StringConstTruncated">True</Compiler>

+      <Compiler Name="ForLoopVarVarPar">True</Compiler>

+      <Compiler Name="TypedConstVarPar">True</Compiler>

+      <Compiler Name="AsgToTypedConst">True</Compiler>

+      <Compiler Name="CaseLabelRange">True</Compiler>

+      <Compiler Name="ForVariable">True</Compiler>

+      <Compiler Name="ConstructingAbstract">True</Compiler>

+      <Compiler Name="ComparisonFalse">True</Compiler>

+      <Compiler Name="ComparisonTrue">True</Compiler>

+      <Compiler Name="ComparingSignedUnsigned">True</Compiler>

+      <Compiler Name="CombiningSignedUnsigned">True</Compiler>

+      <Compiler Name="UnsupportedConstruct">True</Compiler>

+      <Compiler Name="FileOpen">True</Compiler>

+      <Compiler Name="FileOpenUnitSrc">True</Compiler>

+      <Compiler Name="BadGlobalSymbol">True</Compiler>

+      <Compiler Name="DuplicateConstructorDestructor">True</Compiler>

+      <Compiler Name="InvalidDirective">True</Compiler>

+      <Compiler Name="PackageNoLink">True</Compiler>

+      <Compiler Name="PackageThreadVar">True</Compiler>

+      <Compiler Name="ImplicitImport">True</Compiler>

+      <Compiler Name="HPPEMITIgnored">True</Compiler>

+      <Compiler Name="NoRetVal">True</Compiler>

+      <Compiler Name="UseBeforeDef">True</Compiler>

+      <Compiler Name="ForLoopVarUndef">True</Compiler>

+      <Compiler Name="UnitNameMismatch">True</Compiler>

+      <Compiler Name="NoCFGFileFound">True</Compiler>

+      <Compiler Name="ImplicitVariants">True</Compiler>

+      <Compiler Name="UnicodeToLocale">True</Compiler>

+      <Compiler Name="LocaleToUnicode">True</Compiler>

+      <Compiler Name="ImagebaseMultiple">True</Compiler>

+      <Compiler Name="SuspiciousTypecast">True</Compiler>

+      <Compiler Name="PrivatePropAccessor">True</Compiler>

+      <Compiler Name="UnsafeType">False</Compiler>

+      <Compiler Name="UnsafeCode">False</Compiler>

+      <Compiler Name="UnsafeCast">False</Compiler>

+      <Compiler Name="OptionTruncated">True</Compiler>

+      <Compiler Name="WideCharReduced">True</Compiler>

+      <Compiler Name="DuplicatesIgnored">True</Compiler>

+      <Compiler Name="UnitInitSeq">True</Compiler>

+      <Compiler Name="LocalPInvoke">True</Compiler>

+      <Compiler Name="MessageDirective">True</Compiler>

+      <Compiler Name="CodePage"></Compiler>

+    </Compiler>

+    <Linker>

+      <Linker Name="MapFile">0</Linker>

+      <Linker Name="OutputObjs">0</Linker>

+      <Linker Name="GenerateHpps">False</Linker>

+      <Linker Name="ConsoleApp">1</Linker>

+      <Linker Name="DebugInfo">False</Linker>

+      <Linker Name="RemoteSymbols">False</Linker>

+      <Linker Name="GenerateDRC">False</Linker>

+      <Linker Name="MinStackSize">16384</Linker>

+      <Linker Name="MaxStackSize">1048576</Linker>

+      <Linker Name="ImageBase">4194304</Linker>

+      <Linker Name="ExeDescription"></Linker>

+    </Linker>

+    <Directories>

+      <Directories Name="OutputDir"></Directories>

+      <Directories Name="UnitOutputDir"></Directories>

+      <Directories Name="PackageDLLOutputDir"></Directories>

+      <Directories Name="PackageDCPOutputDir"></Directories>

+      <Directories Name="SearchPath">..\..\src\lib\JEDI-SDL\SDL\Pas</Directories>

+      <Directories Name="Packages"></Directories>

+      <Directories Name="Conditionals"></Directories>

+      <Directories Name="DebugSourceDirs"></Directories>

+      <Directories Name="UsePackages">False</Directories>

+    </Directories>

+    <Parameters>

+      <Parameters Name="RunParams"></Parameters>

+      <Parameters Name="HostApplication"></Parameters>

+      <Parameters Name="Launcher"></Parameters>

+      <Parameters Name="UseLauncher">False</Parameters>

+      <Parameters Name="DebugCWD"></Parameters>

+      <Parameters Name="Debug Symbols Search Path"></Parameters>

+      <Parameters Name="LoadAllSymbols">True</Parameters>

+      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+    </Parameters>

+    <Language>

+      <Language Name="ActiveLang"></Language>

+      <Language Name="ProjectLang">$00000000</Language>

+      <Language Name="RootDir"></Language>

+    </Language>

+    <VersionInfo>

+      <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+      <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+      <VersionInfo Name="MajorVer">1</VersionInfo>

+      <VersionInfo Name="MinorVer">0</VersionInfo>

+      <VersionInfo Name="Release">0</VersionInfo>

+      <VersionInfo Name="Build">0</VersionInfo>

+      <VersionInfo Name="Debug">False</VersionInfo>

+      <VersionInfo Name="PreRelease">False</VersionInfo>

+      <VersionInfo Name="Special">False</VersionInfo>

+      <VersionInfo Name="Private">False</VersionInfo>

+      <VersionInfo Name="DLL">False</VersionInfo>

+      <VersionInfo Name="Locale">1031</VersionInfo>

+      <VersionInfo Name="CodePage">1252</VersionInfo>

+    </VersionInfo>

+    <VersionInfoKeys>

+      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+      <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+    </VersionInfoKeys>

+  </Delphi.Personality>

+</BorlandProject>

diff --git a/plugins/Don't_Get_Worse/Hold_The_Line.dpr b/plugins/Don't_Get_Worse/Hold_The_Line.dpr
index a197d51b..8ac4b2e7 100644
--- a/plugins/Don't_Get_Worse/Hold_The_Line.dpr
+++ b/plugins/Don't_Get_Worse/Hold_The_Line.dpr
@@ -1,9 +1,10 @@
 library Hold_The_Line;
 
 uses
-  ModiSDK in '..\SDK\ModiSDK.pas',
+  ModiSDK  in '..\SDK\ModiSDK.pas',
   StrUtils in '..\SDK\StrUtils.pas',
-  OpenGL12,
+  moduleloader in '..\..\src\lib\JEDI-SDL\SDL\Pas\moduleloader.pas',
+  gl           in '..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas',
   Windows;
 
 var
@@ -84,8 +85,6 @@ begin
     PlayerTimes[I] := 0;
   end;
 
-  LoadOpenGL;
-
   Result := True;
 end;
 
diff --git a/plugins/Don't_Get_Worse/Hold_The_Line.lpi b/plugins/Don't_Get_Worse/Hold_The_Line.lpi
new file mode 100644
index 00000000..bb21d5d9
--- /dev/null
+++ b/plugins/Don't_Get_Worse/Hold_The_Line.lpi
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>

+<CONFIG>

+  <ProjectOptions>

+    <PathDelim Value="\"/>

+    <Version Value="6"/>

+    <General>

+      <Flags>

+        <MainUnitHasUsesSectionForAllUnits Value="False"/>

+        <MainUnitHasCreateFormStatements Value="False"/>

+        <MainUnitHasTitleStatement Value="False"/>

+      </Flags>

+      <MainUnit Value="0"/>

+      <TargetFileExt Value=".exe"/>

+      <Title Value="Hold_The_Line"/>

+      <ActiveEditorIndexAtStart Value="2"/>

+    </General>

+    <VersionInfo>

+      <ProjectVersion Value=""/>

+      <Language Value=""/>

+      <CharSet Value=""/>

+    </VersionInfo>

+    <PublishOptions>

+      <Version Value="2"/>

+      <IgnoreBinaries Value="False"/>

+      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>

+      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>

+    </PublishOptions>

+    <RunParams>

+      <local>

+        <FormatVersion Value="1"/>

+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>

+      </local>

+    </RunParams>

+    <Units Count="4">

+      <Unit0>

+        <Filename Value="Hold_The_Line.dpr"/>

+        <IsPartOfProject Value="True"/>

+        <UnitName Value="Hold_The_Line"/>

+        <CursorPos X="22" Y="1"/>

+        <TopLine Value="1"/>

+        <EditorIndex Value="0"/>

+        <UsageCount Value="20"/>

+        <Loaded Value="True"/>

+      </Unit0>

+      <Unit1>

+        <Filename Value="..\SDK\StrUtils.pas"/>

+        <UnitName Value="StrUtils"/>

+        <CursorPos X="4" Y="13"/>

+        <TopLine Value="1"/>

+        <EditorIndex Value="2"/>

+        <UsageCount Value="10"/>

+        <Loaded Value="True"/>

+      </Unit1>

+      <Unit2>

+        <Filename Value="..\..\src\lib\JEDI-SDL\OpenGL\Pas\gl.pas"/>

+        <UnitName Value="gl"/>

+        <CursorPos X="1" Y="1"/>

+        <TopLine Value="1"/>

+        <UsageCount Value="10"/>

+      </Unit2>

+      <Unit3>

+        <Filename Value="..\SDK\ModiSDK.pas"/>

+        <UnitName Value="ModiSDK"/>

+        <CursorPos X="1" Y="8"/>

+        <TopLine Value="1"/>

+        <EditorIndex Value="1"/>

+        <UsageCount Value="10"/>

+        <Loaded Value="True"/>

+      </Unit3>

+    </Units>

+    <JumpHistory Count="1" HistoryIndex="0">

+      <Position1>

+        <Filename Value="..\SDK\StrUtils.pas"/>

+        <Caret Line="1" Column="1" TopLine="1"/>

+      </Position1>

+    </JumpHistory>

+  </ProjectOptions>

+  <CompilerOptions>

+    <Version Value="8"/>

+    <PathDelim Value="\"/>

+    <SearchPaths>

+      <IncludeFiles Value="..\..\src\lib\JEDI-SDL\SDL\Pas\"/>

+    </SearchPaths>

+    <Parsing>

+      <SyntaxOptions>

+        <CStyleOperator Value="False"/>

+      </SyntaxOptions>

+    </Parsing>

+    <Linking>

+      <Options>

+        <ExecutableType Value="Library"/>

+      </Options>

+    </Linking>

+    <Other>

+      <CompilerPath Value="$(CompPath)"/>

+    </Other>

+  </CompilerOptions>

+  <Debugging>

+    <Exceptions Count="2">

+      <Item1>

+        <Name Value="ECodetoolError"/>

+      </Item1>

+      <Item2>

+        <Name Value="EFOpenError"/>

+      </Item2>

+    </Exceptions>

+  </Debugging>

+</CONFIG>

diff --git a/plugins/SDK/ModiSDK.pas b/plugins/SDK/ModiSDK.pas
index 76dcf8ea..c0e66387 100644
--- a/plugins/SDK/ModiSDK.pas
+++ b/plugins/SDK/ModiSDK.pas
@@ -6,8 +6,6 @@ interface
   {$MODE Delphi}
 {$ENDIF}
 
-{$I switches.inc}
-
 type  //PluginInfo, for Init
   TPluginInfo = record
     //Info
diff --git a/plugins/SDK/StrUtils.pas b/plugins/SDK/StrUtils.pas
index a5735b8f..069c89c3 100644
--- a/plugins/SDK/StrUtils.pas
+++ b/plugins/SDK/StrUtils.pas
@@ -2,7 +2,9 @@ unit StrUtils;
 
 interface
 
-{$I switches.inc}
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
 
 uses ModiSDK;
 
@@ -12,6 +14,10 @@ procedure FreeStr(Str: PChar);
 
 implementation
 
+{$IFDEF FPC}
+  {$ASMMODE Intel}
+{$ENDIF}
+
 {function StrToAChar(Str: String): AChar;
 var
   L, I: Integer;
@@ -70,4 +76,4 @@ begin
   FreeMem(Str);
 end;
 
-end.
\ No newline at end of file
+end.