minor bug fixes to have lazarus build load resources into SDL_Image

correctly... ( lazarus Resources are weak compared to delphi :( )

also Laz build will now run, and main loop works properly.


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

2 files changed, 54 insertions, 20 deletions

diff --git a/Tools/USDXResCompiler.lpi b/Tools/USDXResCompiler.lpi
index b7c068be..bf6f0a54 100644
--- a/Tools/USDXResCompiler.lpi
+++ b/Tools/USDXResCompiler.lpi
@@ -7,7 +7,7 @@
       <MainUnit Value="0"/>

       <IconPath Value="./"/>

       <TargetFileExt Value=".exe"/>

-      <ActiveEditorIndexAtStart Value="0"/>

+      <ActiveEditorIndexAtStart Value="1"/>

     </General>

     <VersionInfo>

       <ProjectVersion Value=""/>

@@ -31,23 +31,56 @@
         <PackageName Value="lcl"/>

       </Item1>

     </RequiredPackages>

-    <Units Count="1">

+    <Units Count="2">

       <Unit0>

         <Filename Value="USDXResCompiler.lpr"/>

         <IsPartOfProject Value="True"/>

         <UnitName Value="USDXResCompiler"/>

-        <CursorPos X="47" Y="34"/>

-        <TopLine Value="1"/>

+        <CursorPos X="21" Y="28"/>

+        <TopLine Value="15"/>

         <EditorIndex Value="0"/>

-        <UsageCount Value="20"/>

+        <UsageCount Value="23"/>

         <Loaded Value="True"/>

       </Unit0>

+      <Unit1>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

+        <UnitName Value="LResources"/>

+        <CursorPos X="31" Y="55"/>

+        <TopLine Value="36"/>

+        <EditorIndex Value="1"/>

+        <UsageCount Value="10"/>

+        <Loaded Value="True"/>

+      </Unit1>

     </Units>

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

+    <JumpHistory Count="7" HistoryIndex="6">

       <Position1>

         <Filename Value="USDXResCompiler.lpr"/>

-        <Caret Line="6" Column="1" TopLine="1"/>

+        <Caret Line="28" Column="21" TopLine="15"/>

       </Position1>

+      <Position2>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

+        <Caret Line="920" Column="30" TopLine="901"/>

+      </Position2>

+      <Position3>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

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

+      </Position3>

+      <Position4>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

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

+      </Position4>

+      <Position5>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

+        <Caret Line="259" Column="25" TopLine="239"/>

+      </Position5>

+      <Position6>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

+        <Caret Line="52" Column="17" TopLine="47"/>

+      </Position6>

+      <Position7>

+        <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>

+        <Caret Line="259" Column="30" TopLine="149"/>

+      </Position7>

     </JumpHistory>

   </ProjectOptions>

   <CompilerOptions>

@@ -61,11 +94,15 @@
     </Other>

   </CompilerOptions>

   <Debugging>

-    <BreakPoints Count="1">

+    <BreakPoints Count="2">

       <Item1>

         <Source Value="USDXResCompiler.lpr"/>

         <Line Value="14"/>

       </Item1>

+      <Item2>

+        <Source Value="USDXResCompiler.lpr"/>

+        <Line Value="18"/>

+      </Item2>

     </BreakPoints>

   </Debugging>

 </CONFIG>

diff --git a/Tools/USDXResCompiler.lpr b/Tools/USDXResCompiler.lpr
index b6d0ef7d..5acdd8d9 100644
--- a/Tools/USDXResCompiler.lpr
+++ b/Tools/USDXResCompiler.lpr
@@ -10,15 +10,13 @@ uses
 var

   lResourceFile : TMemoryStream;

   

-procedure AddFile( aResName, aResTye, aFile : string );

+procedure AddFile( aResName, aResType, aFile : string );

 var

   lTmpStream : TmemoryStream;

 begin

-  writeln();

-  writeln( aFile );

   if not fileexists( aFile ) then

   begin

-    writeln( 'NOT FOUND' );

+    writeln( 'SKIPED' + ' ( '+aFile+' ) File not found' );

     exit;

   end;

     

@@ -27,8 +25,8 @@ begin
     lTmpStream.loadfromfile( aFile );

     lTmpStream.position := 0;

     

-    BinaryToLazarusResourceCode(lTmpStream, lResourceFile, aResName, aResTye);

-    writeln( 'Added' );

+    BinaryToLazarusResourceCode(lTmpStream, lResourceFile, aResName, aResType);

+    writeln( 'ADDED - ' + aResType + ' : ' + aResName + ' ( '+aFile+' )' );

   finally

     freeandnil( lTmpStream );

   end;

@@ -39,21 +37,20 @@ begin
 

   lResourceFile := TMemoryStream.create();

   try

-     AddFile( 'Font', 'PNG', '..\Fonts\Normal\eurostar_regular.png' );

-     AddFile( 'Font', 'FNT', '.\Fonts\Normal\eurostar_regular.dat' );

+     AddFile( 'Font', 'TEX', '..\Fonts\Normal\eurostar_regular.png' );

+     AddFile( 'Font', 'FNT', '..\Fonts\Normal\eurostar_regular.dat' );

 

-     AddFile( 'FontB', 'PNG', '..\Fonts\Bold\eurostar_regular_bold.png' );

+     AddFile( 'FontB', 'TEX', '..\Fonts\Bold\eurostar_regular_bold.png' );

      AddFile( 'FontB', 'FNT', '..\Fonts\Bold\eurostar_regular_bold.dat' );

 

-     AddFile( 'FontO', 'PNG', '..\Fonts\Outline 1\Outline 1.PNG' );

+     AddFile( 'FontO', 'TEX', '..\Fonts\Outline 1\Outline 1.PNG' );

      AddFile( 'FontO', 'FNT', '..\Fonts\Outline 1\Outline 1.dat' );

      

-     AddFile( 'FontO2', 'PNG', '..\Fonts\Outline 2\Outline 2.PNG' );

+     AddFile( 'FontO2', 'TEX', '..\Fonts\Outline 2\Outline 2.PNG' );

      AddFile( 'FontO2', 'FNT', '..\Fonts\Outline 2\Outline 2.dat' );

      

      AddFile( 'MAINICON', 'ICON', '..\Graphics\ustar-icon_v01.ico' );

 

-     AddFile( 'MAINICON', 'ICON', '..\Graphics\ustar-icon_v01.ico' );

 

      AddFile( 'CRDTS_BG', 'PNG', '..\Graphics\credits_v5_bg.png' );

      AddFile( 'CRDTS_OVL', 'PNG', '..\Graphics\credits_v5_overlay.png"' );