Skip to content

Commit 97fd5af

Browse files
committed
win32 installation script
1 parent 9b21428 commit 97fd5af

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ add_definitions(-DOPTION_SD_CARD=1)
5252
add_definitions(-DEEZ_PLATFORM_SIMULATOR)
5353

5454
if(WIN32)
55+
ENABLE_LANGUAGE(RC)
5556
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
5657
add_definitions(-DEEZ_PLATFORM_SIMULATOR_WIN32)
5758
endif()
@@ -722,6 +723,16 @@ set(header_third_party_micropython_py
722723
list (APPEND header_files ${header_third_party_micropython_py})
723724
source_group("third_party\\micropython\\py" FILES ${src_third_party_micropython_py} ${header_third_party_micropython_py})
724725

726+
if(WIN32)
727+
set(src_win32_specific
728+
src/eez/platform/simulator/win32/icon.rc
729+
)
730+
list (APPEND src_files ${src_win32_specific})
731+
source_group("eez\\win32" FILES ${src_win32_specific})
732+
733+
set(SOURCES src/eez/platform/simulator/win32/icon.rc ${src_files})
734+
endif()
735+
725736
add_executable(modular-psu-firmware ${src_files} ${header_files})
726737

727738
if(MSVC)
1.72 KB
Binary file not shown.

build/win32_installation_script.iss renamed to src/eez/platform/simulator/win32/win32_installation_script.iss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@ AppUpdatesURL={#MyAppURL}
2222
DefaultDirName={pf}\{#MyAppName}
2323
DefaultGroupName={#MyAppName}
2424
AllowNoIcons=yes
25-
LicenseFile=..\LICENSE.TXT
26-
OutputDir=.\win32\Installation
25+
LicenseFile=..\..\..\..\..\LICENSE.TXT
26+
OutputDir=..\..\..\..\..\build\win32\Installation
2727
OutputBaseFilename=setup
2828
Compression=lzma
2929
SolidCompression=yes
30-
AppIcon=..\images\eez.ico
3130

3231
[Languages]
3332
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -37,16 +36,16 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
3736
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
3837

3938
[Files]
40-
Source: ".\win32\Debug\modular-psu-firmware.exe"; DestDir: "{app}"; Flags: ignoreversion
41-
Source: ".\win32\Debug\libjpeg-9.dll"; DestDir: "{app}"; Flags: ignoreversion
42-
Source: ".\win32\Debug\libpng16-16.dll"; DestDir: "{app}"; Flags: ignoreversion
43-
Source: ".\win32\Debug\libtiff-5.dll"; DestDir: "{app}"; Flags: ignoreversion
44-
Source: ".\win32\Debug\libwebp-7.dll"; DestDir: "{app}"; Flags: ignoreversion
45-
Source: ".\win32\Debug\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
46-
Source: ".\win32\Debug\SDL2_image.dll"; DestDir: "{app}"; Flags: ignoreversion
47-
Source: ".\win32\Debug\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
48-
Source: "..\images\eez.png"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs
49-
Source: "..\docs\SCPI reference guide\EEZ BB3 SCPI reference guide.pdf"; DestDir: "{app}"; Flags: ignoreversion
39+
Source: "..\..\..\..\..\build\win32\Debug\modular-psu-firmware.exe"; DestDir: "{app}"; Flags: ignoreversion
40+
Source: "..\..\..\..\..\build\win32\Debug\libjpeg-9.dll"; DestDir: "{app}"; Flags: ignoreversion
41+
Source: "..\..\..\..\..\build\win32\Debug\libpng16-16.dll"; DestDir: "{app}"; Flags: ignoreversion
42+
Source: "..\..\..\..\..\build\win32\Debug\libtiff-5.dll"; DestDir: "{app}"; Flags: ignoreversion
43+
Source: "..\..\..\..\..\build\win32\Debug\libwebp-7.dll"; DestDir: "{app}"; Flags: ignoreversion
44+
Source: "..\..\..\..\..\build\win32\Debug\SDL2.dll"; DestDir: "{app}"; Flags: ignoreversion
45+
Source: "..\..\..\..\..\build\win32\Debug\SDL2_image.dll"; DestDir: "{app}"; Flags: ignoreversion
46+
Source: "..\..\..\..\..\build\win32\Debug\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion
47+
Source: "..\..\..\..\..\images\eez.png"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs
48+
Source: "..\..\..\..\..\docs\SCPI reference guide\EEZ BB3 SCPI reference guide.pdf"; DestDir: "{app}"; Flags: ignoreversion
5049
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
5150

5251
[Icons]

0 commit comments

Comments
 (0)