Skip to content

Fix resource loading issues and add automatic toolbar copying to output dir #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzagozda merged 1 commit into from
Jan 28, 2026
Merged

Fix resource loading issues and add automatic toolbar copying to output dir #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/salamand.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Microsoft Visual C++ generated resource script.
// Microsoft Visual C++ generated resource script.
//
#pragma code_page(65001)

Expand Down Expand Up @@ -35,17 +35,17 @@ 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

3 TEXTINCLUDE
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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/salamand.rc2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// salamand.rc2 - resources Microsoft Visual C++ does not edit directly
//

Expand Down Expand Up @@ -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"
4 changes: 2 additions & 2 deletions src/vcxproj/sal_base.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -33,4 +33,4 @@
<Culture>0x0409</Culture>
</ResourceCompile>
</ItemDefinitionGroup>
</Project>
</Project>
7 changes: 7 additions & 0 deletions src/vcxproj/salamand.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down