From 4fcb2bd721919ee9bef62a8f70e9d36fc05fc90c Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 4 Nov 2008 13:32:26 +0000 Subject: - 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 --- plugins/Don't_Get_Worse/Hold_The_Line.bdsproj | 175 ++++++++++++++++++++++++++ plugins/Don't_Get_Worse/Hold_The_Line.dpr | 7 +- plugins/Don't_Get_Worse/Hold_The_Line.lpi | 108 ++++++++++++++++ plugins/SDK/ModiSDK.pas | 2 - plugins/SDK/StrUtils.pas | 10 +- 5 files changed, 294 insertions(+), 8 deletions(-) create mode 100644 plugins/Don't_Get_Worse/Hold_The_Line.bdsproj create mode 100644 plugins/Don't_Get_Worse/Hold_The_Line.lpi 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 @@ + + + + + + + + + + + + Hold_The_Line.dpr + + + 7.0 + + + 8 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + True + True + WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; + + False + + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + False + False + False + True + True + True + True + True + True + + + + 0 + 0 + False + 1 + False + False + False + 16384 + 1048576 + 4194304 + + + + + + + + ..\..\src\lib\JEDI-SDL\SDL\Pas + + + + False + + + + + + False + + + True + False + + + + $00000000 + + + + False + False + 1 + 0 + 0 + 0 + False + False + False + False + False + 1031 + 1252 + + + + + 1.0.0.0 + + + + + + 1.0.0.0 + + + + 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 @@ + + + + + + + + + + + + + + + <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. -- cgit v1.2.3