Update autogenerated project files, to have fast GPU

castle-engine · Jul 6, 2023 · ade55e2 · ade55e2
1 parent 329c214
commit ade55e2
Show file tree

Hide file tree

Showing 8 changed files with 394 additions and 15 deletions.
diff --git a/client/CastleEngineManifest.xml b/client/CastleEngineManifest.xml
@@ -5,7 +5,7 @@
   qualified_name="com.mycompany.notquake"
   caption="Not Quake"
 >
-  <version value="1.1.0" code="2" />
+  <version value="1.2.0" code="2" />
   <compiler_options>
     <search_paths>
       <path value="code/" />

diff --git a/client/castleautogenerated.pas b/client/castleautogenerated.pas
@@ -23,7 +23,7 @@ implementation
 initialization
   ApplicationProperties.ApplicationName := 'not-quake';
   ApplicationProperties.Caption := 'Not Quake';
-  ApplicationProperties.Version := '1.0.0';
+  ApplicationProperties.Version := '1.2.0';
 
   if not IsLibrary then
     Application.ParseStandardParameters;

diff --git a/client/not_quake_standalone.dpr b/client/not_quake_standalone.dpr
@@ -30,6 +30,38 @@ uses
   {$endif}
   CastleAutoGenerated, CastleWindow, GameInitialize;
 
+{ Forces using a dedicated (faster) GPU on laptops with multiple GPUs.
+  See https://castle-engine.io/dedicated_gpu }
+{$if (not defined(CASTLE_NO_FORCE_DEDICATED_GPU)) and (defined(cpu386) or defined(cpux64) or defined(cpuamd64)) and (defined(MSWINDOWS) or defined(Linux))}
+    {$ifdef fpc}
+     {$asmmode intel}
+    {$endif}
+
+    procedure NvOptimusEnablement; {$ifdef fpc}assembler; nostackframe;{$endif}
+    asm
+    {$ifdef cpu64}
+    {$ifndef fpc}
+     .NOFRAME
+    {$endif}
+    {$endif}
+     dd 1
+    end;
+
+    procedure AmdPowerXpressRequestHighPerformance; {$ifdef fpc}assembler; nostackframe;{$endif}
+    asm
+    {$ifdef cpu64}
+    {$ifndef fpc}
+     .NOFRAME
+    {$endif}
+    {$endif}
+     dd 1
+    end;
+
+    exports
+      NvOptimusEnablement,
+      AmdPowerXpressRequestHighPerformance;
+{$ifend}
+
 begin
   Application.MainWindow.OpenAndRun;
 end.
diff --git a/client/not_quake_standalone.dproj b/client/not_quake_standalone.dproj
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <ProjectGuid>{947138E0-253D-48F6-A076-F955B14905C7}</ProjectGuid>
+        <ProjectGuid>{2B90ADD7-AC80-41D0-92D7-2B2002EB7E10}</ProjectGuid>
         <MainSource>not_quake_standalone.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
@@ -79,7 +79,7 @@
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
         <Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
-        <DCC_UnitSearchPath>/home/michalis/sources/castle-engine/castle-engine/src/base;/home/michalis/sources/castle-engine/castle-engine/src/common_includes;/home/michalis/sources/castle-engine/castle-engine/src/base/android;/home/michalis/sources/castle-engine/castle-engine/src/base/windows;/home/michalis/sources/castle-engine/castle-engine/src/base/unix;/home/michalis/sources/castle-engine/castle-engine/src/base_rendering;/home/michalis/sources/castle-engine/castle-engine/src/base_rendering/glsl/generated-pascal;/home/michalis/sources/castle-engine/castle-engine/src/fonts;/home/michalis/sources/castle-engine/castle-engine/src/window;/home/michalis/sources/castle-engine/castle-engine/src/window/gtk;/home/michalis/sources/castle-engine/castle-engine/src/window/windows;/home/michalis/sources/castle-engine/castle-engine/src/window/unix;/home/michalis/sources/castle-engine/castle-engine/src/window/deprecated_units;/home/michalis/sources/castle-engine/castle-engine/src/images;/home/michalis/sources/castle-engine/castle-engine/src/transform;/home/michalis/sources/castle-engine/castle-engine/src/scene;/home/michalis/sources/castle-engine/castle-engine/src/scene/glsl/generated-pascal;/home/michalis/sources/castle-engine/castle-engine/src/scene/x3d;/home/michalis/sources/castle-engine/castle-engine/src/scene/load;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/spine;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/collada;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/pasgltf;/home/michalis/sources/castle-engine/castle-engine/src/audio;/home/michalis/sources/castle-engine/castle-engine/src/audio/fmod;/home/michalis/sources/castle-engine/castle-engine/src/audio/openal;/home/michalis/sources/castle-engine/castle-engine/src/audio/ogg_vorbis;/home/michalis/sources/castle-engine/castle-engine/src/files;/home/michalis/sources/castle-engine/castle-engine/src/files/indy;/home/michalis/sources/castle-engine/castle-engine/src/castlescript;/home/michalis/sources/castle-engine/castle-engine/src/ui;/home/michalis/sources/castle-engine/castle-engine/src/ui/windows;/home/michalis/sources/castle-engine/castle-engine/src/services;/home/michalis/sources/castle-engine/castle-engine/src/physics;/home/michalis/sources/castle-engine/castle-engine/src/physics/kraft;/home/michalis/sources/castle-engine/castle-engine/src/deprecated_units;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source/JpegLib;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source/ZLib;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extras/Extensions;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions/J2KObjects;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions/LibTiff;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions;/home/michalis/sources/castle-engine/castle-engine/src/compatibility/delphi-only;/home/michalis/sources/castle-engine/castle-engine/src/compatibility/delphi-only/fcl-json;code/;../common/;../rnl/src/;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+        <DCC_UnitSearchPath>/home/michalis/sources/castle-engine/castle-engine/src/base;/home/michalis/sources/castle-engine/castle-engine/src/common_includes;/home/michalis/sources/castle-engine/castle-engine/src/base/android;/home/michalis/sources/castle-engine/castle-engine/src/base/windows;/home/michalis/sources/castle-engine/castle-engine/src/base/unix;/home/michalis/sources/castle-engine/castle-engine/src/base_rendering;/home/michalis/sources/castle-engine/castle-engine/src/base_rendering/glsl/generated-pascal;/home/michalis/sources/castle-engine/castle-engine/src/fonts;/home/michalis/sources/castle-engine/castle-engine/src/window;/home/michalis/sources/castle-engine/castle-engine/src/window/gtk;/home/michalis/sources/castle-engine/castle-engine/src/window/windows;/home/michalis/sources/castle-engine/castle-engine/src/window/unix;/home/michalis/sources/castle-engine/castle-engine/src/window/deprecated_units;/home/michalis/sources/castle-engine/castle-engine/src/images;/home/michalis/sources/castle-engine/castle-engine/src/transform;/home/michalis/sources/castle-engine/castle-engine/src/scene;/home/michalis/sources/castle-engine/castle-engine/src/scene/glsl/generated-pascal;/home/michalis/sources/castle-engine/castle-engine/src/scene/x3d;/home/michalis/sources/castle-engine/castle-engine/src/scene/load;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/spine;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/md3;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/collada;/home/michalis/sources/castle-engine/castle-engine/src/scene/load/pasgltf;/home/michalis/sources/castle-engine/castle-engine/src/audio;/home/michalis/sources/castle-engine/castle-engine/src/audio/fmod;/home/michalis/sources/castle-engine/castle-engine/src/audio/openal;/home/michalis/sources/castle-engine/castle-engine/src/audio/ogg_vorbis;/home/michalis/sources/castle-engine/castle-engine/src/files;/home/michalis/sources/castle-engine/castle-engine/src/files/indy;/home/michalis/sources/castle-engine/castle-engine/src/castlescript;/home/michalis/sources/castle-engine/castle-engine/src/ui;/home/michalis/sources/castle-engine/castle-engine/src/ui/windows;/home/michalis/sources/castle-engine/castle-engine/src/services;/home/michalis/sources/castle-engine/castle-engine/src/physics;/home/michalis/sources/castle-engine/castle-engine/src/physics/kraft;/home/michalis/sources/castle-engine/castle-engine/src/deprecated_units;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source/JpegLib;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Source/ZLib;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extras/Extensions;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions/J2KObjects;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions/LibTiff;/home/michalis/sources/castle-engine/castle-engine/src/vampyre_imaginglib/src/Extensions;/home/michalis/sources/castle-engine/castle-engine/src/delphi;/home/michalis/sources/castle-engine/castle-engine/src/compatibility/delphi-only;/home/michalis/sources/castle-engine/castle-engine/src/compatibility/delphi-only/fcl-json;code/;../common/;../rnl/src/;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_DcuOutput>castle-engine-output\compilation\delphi</DCC_DcuOutput>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">

diff --git a/client/not_quake_standalone.lpi b/client/not_quake_standalone.lpi
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="12"/>
     <General>
       <Flags>
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
         <MainUnitHasScaledStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <Title Value="not_quake"/>
@@ -31,34 +32,34 @@
         <UnitName Value="castleautogenerated"/>
       </Unit1>
       <Unit2>
-        <Filename Value="code/gameplayers.pas"/>
+        <Filename Value="code/gamestateplay.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="gameplayers"/>
+        <UnitName Value="gamestateplay"/>
       </Unit2>
       <Unit3>
-        <Filename Value="code/gameclient.pas"/>
+        <Filename Value="code/gamestatemainmenu.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="gameclient"/>
+        <UnitName Value="gamestatemainmenu"/>
       </Unit3>
       <Unit4>
         <Filename Value="code/gameinitialize.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="gameinitialize"/>
       </Unit4>
       <Unit5>
-        <Filename Value="code/gamestatemainmenu.pas"/>
+        <Filename Value="code/gameplayers.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="gamestatemainmenu"/>
+        <UnitName Value="gameplayers"/>
       </Unit5>
       <Unit6>
-        <Filename Value="code/gamestateinputchat.pas"/>
+        <Filename Value="code/gameclient.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="gamestateinputchat"/>
+        <UnitName Value="gameclient"/>
       </Unit6>
       <Unit7>
-        <Filename Value="code/gamestateplay.pas"/>
+        <Filename Value="code/gamestateinputchat.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="gamestateplay"/>
+        <UnitName Value="gamestateinputchat"/>
       </Unit7>
       <Unit8>
         <Filename Value="../common/gamenetwork.pas"/>
@@ -95,6 +96,11 @@
         <OverflowChecks Value="True"/>
       </Checks>
     </CodeGeneration>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
+    </Linking>
     <Other>
       <Verbosity>
         <ShowHints Value="False"/>

diff --git a/server/castleautogenerated.pas b/server/castleautogenerated.pas
@@ -0,0 +1,41 @@
+{ Auto-generated unit with information about the project.
+  The information set here reflects the CastleEngineManifest.xml properties.
+
+  You should not modify this file manually.
+  Regenerate it using CGE editor "Code -> Regenerate Project" menu item
+  (or command-line: "castle-engine generate-program").
+
+  Note: This file has UTF-8 BOM, which makes sure that string literals
+  are interpreted as UTF-8. This is important, as CGE build tool will
+  place here caption encoded in UTF-8.
+  Without the BOM, right now both FPC and Delphi
+  would interpret the file as having ANSI encoding on Windows (see
+  https://blogs.embarcadero.com/the-delphi-compiler-and-utf-8-encoded-source-code-files-with-no-bom/ ,
+  https://wiki.freepascal.org/FPC_Unicode_support#Source_file_codepage ) }
+unit CastleAutoGenerated;
+
+interface
+
+implementation
+
+uses CastleApplicationProperties, CastleWindow, CastleLog;
+
+initialization
+  ApplicationProperties.ApplicationName := 'not-quake-server';
+  ApplicationProperties.Caption := 'not-quake-server';
+  ApplicationProperties.Version := '0.1';
+
+  if not IsLibrary then
+    Application.ParseStandardParameters;
+
+  { Start logging.
+
+    Should be done after setting ApplicationProperties.ApplicationName/Version,
+    since they are recorded in the first automatic log messages.
+
+    Should be done after basic command-line parameters are parsed
+    for standalone programs (when "not IsLibrary").
+    This allows to handle --version and --help command-line parameters
+    without any extra output on Unix, and to set --log-file . }
+  InitializeLog;
+end.