Skip to content

Commit

Permalink
Deploy Visual C++ Redistributable as dlls
Browse files Browse the repository at this point in the history
  • Loading branch information
stfnp committed Aug 6, 2017
1 parent 2da64b4 commit fe210ad
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 3 additions & 1 deletion platforms/windows/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ def build_application(source_dir, build_dir, output_dir):

subprocess.call(["cmake", "--build", build_dir, "--target", "install"])
subprocess.call([qt_path + "/bin/windeployqt", output_dir + "/bin/bow-simulator.exe",
"--no-translations"])
"--no-translations", "--no-compiler-runtime"])
shutil.copy("C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/msvcp140.dll", output_dir + "/bin")
shutil.copy("C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x86/Microsoft.VC140.CRT/vcruntime140.dll", output_dir + "/bin")
subprocess.call(["rcedit", output_dir + "/bin/bow-simulator.exe", "--set-icon", "resources/icons/logo.ico"])

def build_packages(version, build_dir, output_dir):
Expand Down
2 changes: 0 additions & 2 deletions platforms/windows/setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ UsePreviousTasks=no
Name: english; MessagesFile: compiler:Default.isl

[Files]
Source: "{#BINARY_DIR}/vcredist_x86.exe"; DestDir: {app}; Flags: deleteafterinstall
Source: "{#BINARY_DIR}/*"; DestDir: {app}; Flags: ignoreversion recursesubdirs createallsubdirs

[Icons]
Expand All @@ -44,5 +43,4 @@ Root: HKCR; Subkey: BowSimulatorModelFile\DefaultIcon; ValueType: string; ValueN
Root: HKCR; Subkey: BowSimulatorModelFile\shell\open\command; ValueType: string; ValueName: ""; ValueData: "{app}\{#EXE_NAME} %1"; Tasks: FileAssociation

[Run]
Filename: {app}\vcredist_x86.exe; Parameters: /quiet /install /norestart;
Filename: {app}\{#EXE_NAME}; Description: "Launch Bow Simulator"; Flags: nowait postinstall skipifsilent

0 comments on commit fe210ad

Please sign in to comment.