diff options
| author | Travis Howell | 2011-07-01 15:47:53 +1000 |
|---|---|---|
| committer | Travis Howell | 2011-07-01 15:47:53 +1000 |
| commit | 12c94f749d9d0db98d7e410b0e5df6b1ef49a938 (patch) | |
| tree | 7bb4d89922953be5ff5f0fc89291b8af971bab65 /devtools | |
| parent | 146b90bcbfd3c9c3f45b78cd199b94e85351a3f2 (diff) | |
| parent | 00e3f920d01be56b5882f721a3eaf40ea6210f44 (diff) | |
| download | scummvm-rg350-12c94f749d9d0db98d7e410b0e5df6b1ef49a938.tar.gz scummvm-rg350-12c94f749d9d0db98d7e410b0e5df6b1ef49a938.tar.bz2 scummvm-rg350-12c94f749d9d0db98d7e410b0e5df6b1ef49a938.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/create_project/scripts/installer.vbs | 5 | ||||
| -rwxr-xr-x | devtools/update-version.pl | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index d752355acd..19b4eee49b 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -72,10 +72,9 @@ Sub CreateInstaller() ' Build command line Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ " /Dtop_srcdir=""" & rootFolder & """" & _ - " /Dbuild_dir=""" & targetFolder & """" & _ - " /Dtext_dir=""" & rootFolder & """" & _ + " /Dstaging_dir=""" & targetFolder & """" & _ " /DARCH=""" & arch & """" & _ - " """ & rootFolder & "\dists\nsis\scummvm.nsi""" + " """ & rootFolder & "\dists\win32\scummvm.nsi""" Dim oExec: Set oExec = WshShell.Exec(commandline) If Err.Number <> 0 Then diff --git a/devtools/update-version.pl b/devtools/update-version.pl index 788cbc7e40..169fba7788 100755 --- a/devtools/update-version.pl +++ b/devtools/update-version.pl @@ -39,7 +39,7 @@ my @subs_files = qw( dists/macosx/Info.plist dists/iphone/Info.plist dists/irix/scummvm.spec - dists/nsis/scummvm.nsi + dists/win32/scummvm.nsi dists/wii/meta.xml dists/android/AndroidManifest.xml dists/android/plugin-manifest.xml |