Skip to content

Commit 7f80cd4

Browse files
committed
Setup application icon for Windows build (fixes openscad#3723).
1 parent df36a1e commit 7f80cd4

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed

Diff for: CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -728,16 +728,18 @@ endif()
728728
if (SNAPSHOT)
729729
add_definitions(-DOPENSCAD_SNAPSHOT)
730730
set(RESOURCE_FILES icons/icon-nightly.icns)
731+
set(WINDOWS_RESOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/openscad_win32-nightly.rc)
731732
else()
732733
set(RESOURCE_FILES icons/OpenSCAD.icns)
734+
set(WINDOWS_RESOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/openscad_win32.rc)
733735
endif()
734736

735737
if(ENABLE_SPNAV)
736738
add_definitions(-DENABLE_SPNAV)
737739
list(APPEND Sources src/input/SpaceNavInputDriver.cc)
738740
endif()
739741

740-
add_executable(OpenSCAD ${Sources} ${RESOURCE_FILES})
742+
add_executable(OpenSCAD ${Sources} ${RESOURCE_FILES} ${WINDOWS_RESOURCE_PATH})
741743
add_custom_command(TARGET OpenSCAD POST_BUILD
742744
COMMAND "${CMAKE_CURRENT_LIST_DIR}/scripts/translation-make.sh" "${SUFFIX_WITH_DASH}"
743745
COMMENT "Compiling language files")

Diff for: icons/openscad-nightly.ico

66.1 KB
Binary file not shown.

Diff for: openscad_win32-nightly.rc

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# if defined(UNDER_CE)
2+
# include <winbase.h>
3+
# else
4+
# include <winver.h>
5+
# endif
6+
7+
#include "winuser.h"
8+
1 RT_MANIFEST "scripts/winmanifest.xml"
9+
10+
VS_VERSION_INFO VERSIONINFO
11+
FILEVERSION 0,0,0,0
12+
PRODUCTVERSION 0,0,0,0
13+
FILEFLAGSMASK 0x3fL
14+
#ifdef _DEBUG
15+
FILEFLAGS VS_FF_DEBUG
16+
#else
17+
FILEFLAGS 0x0L
18+
#endif
19+
FILEOS VOS__WINDOWS32
20+
FILETYPE VFT_DLL
21+
FILESUBTYPE 0x0L
22+
BEGIN
23+
BLOCK "StringFileInfo"
24+
BEGIN
25+
BLOCK "0409"
26+
BEGIN
27+
VALUE "CompanyName", "\0"
28+
VALUE "FileDescription", "OpenSCAD Executable\0"
29+
VALUE "FileVersion", "Development build\0"
30+
VALUE "LegalCopyright", "Copyright (C) 2009-2021 The OpenSCAD Developers\0"
31+
VALUE "OriginalFilename", "openscad.exe\0"
32+
VALUE "ProductName", "OpenSCAD (Nightly)\0"
33+
END
34+
END
35+
END
36+
/* End of Version info */
37+
38+
IDI_ICON1 ICON DISCARDABLE "icons/openscad-nightly.ico"
39+
IDI_ICON2 ICON DISCARDABLE "icons/openscad_doc.ico"

0 commit comments

Comments
 (0)