fix: broken ci compilation, move -WB -WR linker options to the conditionals section of the lpi file

ansgarbecker · ansgarbecker · commit 97ec20b9bb0f · 2026-05-15T14:45:29.000+02:00
Refs #2483
diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@ LAZBUILD := $(shell command -v lazbuild)
 OPTS := -B --bm=Release
 OPTSQT5 := --ws=qt5
 OPTSQT6 := --ws=qt6
-OPTSWIN64 := --widgetset=win32 --compiler-options="-WB -WR"
 LPI := heidisql.lpi
 
 BIN := ./out/heidisql
@@ -45,7 +44,7 @@ copy-locale:
 
 build-win64:
 	@echo "=== Building Win64"
-	$(LAZBUILD) $(OPTS) $(OPTSWIN64) $(LPI)
+	lazbuild $(OPTS) $(LPI)
 	@mkdir -p ./out/win64
 	@mv -v "$(BIN).exe" "$(BINWIN64)"
 	@"$(PEFLAGS)" "$(BINWIN64)" --set --all
diff --git a/heidisql.lpi b/heidisql.lpi
@@ -82,17 +82,11 @@
             <OtherUnitFiles Value="source;source\metadarkstyle\src"/>
             <UnitOutputDirectory Value="bin\lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
-          <Conditionals Value="// example for adding linker options on Mac OS X
-//if TargetOS=&apos;darwin&apos; then
-//  LinkerOptions := &apos; -framework OpenGL&apos;;
-if TargetOS=&apos;darwin&apos; then
-  CustomOptions := &apos;-WM10.15&apos;;
+          <Conditionals Value="if TargetOS=&apos;darwin&apos; then
+  CustomOptions := CustomOptions + &apos; -WM10.15&apos;;
 
-// example for adding a unit and include path on Windows
-//if SrcOS=&apos;win&apos; then begin
-//  UnitPath += &apos;;win&apos;;
-//  IncPath += &apos;;win&apos;;
-//end;"/>
+if TargetOS=&apos;win64&apos; then
+  CustomOptions := CustomOptions + &apos; -WB -WR&apos;;"/>
           <CodeGeneration>
             <SmartLinkUnit Value="True"/>
             <Optimizations>
@@ -118,8 +112,6 @@ if TargetOS=&apos;darwin&apos; then
             <CompilerMessages>
               <IgnoredMessages idx6058="True" idx5071="True" idx5062="True" idx5024="True" idx4104="True" idx4046="True" idx3177="True" idx3175="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-WB
--WR"/>
           </Other>
         </CompilerOptions>
       </Item>
@@ -476,17 +468,11 @@ if TargetOS=&apos;darwin&apos; then
       <OtherUnitFiles Value="source;source\metadarkstyle\src"/>
       <UnitOutputDirectory Value="bin\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
-    <Conditionals Value="// example for adding linker options on Mac OS X
-//if TargetOS=&apos;darwin&apos; then
-//  LinkerOptions := &apos; -framework OpenGL&apos;;
-if TargetOS=&apos;darwin&apos; then
-  CustomOptions := &apos;-WM10.15&apos;;
+    <Conditionals Value="if TargetOS=&apos;darwin&apos; then
+  CustomOptions := CustomOptions + &apos; -WM10.15&apos;;
 
-// example for adding a unit and include path on Windows
-//if SrcOS=&apos;win&apos; then begin
-//  UnitPath += &apos;;win&apos;;
-//  IncPath += &apos;;win&apos;;
-//end;"/>
+if TargetOS=&apos;win64&apos; then
+  CustomOptions := CustomOptions + &apos; -WB -WR&apos;;"/>
     <Linking>
       <Debugging>
         <DebugInfoType Value="dsDwarf3"/>
@@ -503,8 +489,6 @@ if TargetOS=&apos;darwin&apos; then
       <CompilerMessages>
         <IgnoredMessages idx6058="True" idx5071="True" idx5062="True" idx5024="True" idx4104="True" idx4046="True" idx3177="True" idx3175="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-WB
--WR"/>
     </Other>
   </CompilerOptions>
   <Debugging>
