From ccad741003ec6c81f5912e32cf19946ab9900810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Skaziak?= <ms310792@student.polsl.pl>
Date: Tue, 27 Jan 2026 16:38:53 +0100
Subject: [PATCH] Fix resource loading issues and add automatic toolbar copying
 to output dir

---
 src/salamand.rc              | 13 +++++--------
 src/salamand.rc2             |  4 ++--
 src/vcxproj/sal_base.props   |  4 ++--
 src/vcxproj/salamand.vcxproj |  7 +++++++
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/salamand.rc b/src/salamand.rc
index 6d8897a5..fbaa7845 100644
--- a/src/salamand.rc
+++ b/src/salamand.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #pragma code_page(65001)
 
@@ -35,9 +35,9 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""winresrc.h""\r\n"
+    "#include \"winresrc.h\"\r\n"
     "\r\n"
-    "#include ""resource.rh2""\r\n"
+    "#include \"resource.rh2\"\r\n"
     "\0"
 END
 
@@ -45,7 +45,7 @@ END
 BEGIN
     "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)\r\n"
     "LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL\r\n"
-    "#include ""salamand.rc2""   // non-Microsoft Visual C++ edited resources\r\n"
+    "#include \"salamand.rc2\"   // non-Microsoft Visual C++ edited resources\r\n"
     "#endif\r\n"
     "\0"
 END
@@ -206,11 +206,8 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL
 #include "salamand.rc2"   // non-Microsoft Visual C++ edited resources
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+#endif    // not APSTUDIO_INVOKED
\ No newline at end of file
diff --git a/src/salamand.rc2 b/src/salamand.rc2
index 8ab48877..4300c7e4 100644
--- a/src/salamand.rc2
+++ b/src/salamand.rc2
@@ -1,4 +1,4 @@
-//
+//
 // salamand.rc2 - resources Microsoft Visual C++ does not edit directly
 //
 
@@ -64,4 +64,4 @@ IDC_COLORTABLE RCDATA "plugins\\shared\\clrtable.dat"
 IDV_ARROW_RIGHT RCDATA "res\\right.svg"
 IDV_ARROW_DOWN RCDATA "res\\down.svg"
 IDV_ARROW_MORE RCDATA "res\\more.svg"
-IDV_ARROW_LESS RCDATA "res\\less.svg"
+IDV_ARROW_LESS RCDATA "res\\less.svg"
\ No newline at end of file
diff --git a/src/vcxproj/sal_base.props b/src/vcxproj/sal_base.props
index 6c8957ec..90f7569d 100644
--- a/src/vcxproj/sal_base.props
+++ b/src/vcxproj/sal_base.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
   </ImportGroup>
@@ -33,4 +33,4 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
   </ItemDefinitionGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/vcxproj/salamand.vcxproj b/src/vcxproj/salamand.vcxproj
index 0b475fc5..89446d9b 100644
--- a/src/vcxproj/salamand.vcxproj
+++ b/src/vcxproj/salamand.vcxproj
@@ -952,6 +952,13 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemDefinitionGroup>
+    <PostBuildEvent>
+      <Command>robocopy ..\res\toolbars "$(OutDir)toolbars" /E /XO /NP /NJS /NJH
+if %errorlevel% leq 1 exit 0 else exit %errorlevel%</Command>
+      <Message>Copying resources to output directory...</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets">
   </Import>
   <ImportGroup Label="ExtensionTargets">