Commit 18067214b840423d939023dc676ae3c730649c02
1 parent
64563198
Exists in
master
and in
1 other branch
Fixing windows builds.
Showing
3 changed files
with
12 additions
and
4 deletions
Show diff stats
configure.ac
... | ... | @@ -117,14 +117,17 @@ case "$host" in |
117 | 117 | if test "$host_cpu" = "x86_64"; then |
118 | 118 | app_cv_programfiles="PROGRAMFILES64" |
119 | 119 | app_cv_winarch="64" |
120 | + app_cv_nsisredir="DisableX64FSRedirection" | |
120 | 121 | else |
121 | 122 | app_cv_programfiles="PROGRAMFILES" |
122 | 123 | app_cv_winarch="32" |
124 | + app_cv_nsisredir="EnableX64FSRedirection" | |
123 | 125 | fi |
124 | 126 | |
125 | 127 | AC_SUBST(PROGRAMFILES,$app_cv_programfiles) |
126 | 128 | AC_SUBST(WINARCH,$app_cv_winarch) |
127 | 129 | AC_SUBST(SONAME,hllapi.dll) |
130 | + AC_SUBST(NSISREDIR,$app_cv_nsisredir) | |
128 | 131 | |
129 | 132 | ;; |
130 | 133 | ... | ... |
win/hllapi.nsi.in
... | ... | @@ -51,13 +51,13 @@ SubSection "@PACKAGE@" SecMain |
51 | 51 | |
52 | 52 | Section "Core" SecCore |
53 | 53 | |
54 | - SetRegView @WINARCH@ | |
55 | - ${DisableX64FSRedirection} | |
56 | - | |
57 | 54 | # define the output path for this file |
58 | 55 | setOutPath $SYSDIR |
59 | 56 | SetShellVarContext all |
60 | 57 | |
58 | + SetRegView @WINARCH@ | |
59 | + ${@NSISREDIR@} | |
60 | + | |
61 | 61 | file "/oname=$SYSDIR\hllapi.dll" "libhllapi.dll" |
62 | 62 | |
63 | 63 | # For compatibility with old scripts. |
... | ... | @@ -99,6 +99,7 @@ Section "Uninstall" |
99 | 99 | delete $INSTDIR\uninstaller.exe |
100 | 100 | |
101 | 101 | # delete installed files |
102 | + ${@NSISREDIR@} | |
102 | 103 | delete $SYSDIR\hllapi.dll |
103 | 104 | delete $SYSDIR\libhllapi.dll |
104 | 105 | ... | ... |
win/pack.sh
... | ... | @@ -104,6 +104,10 @@ do |
104 | 104 | PUBLISH=0 |
105 | 105 | ;; |
106 | 106 | |
107 | + NO-PUBLISH) | |
108 | + PUBLISH=0 | |
109 | + ;; | |
110 | + | |
107 | 111 | PUBLISH) |
108 | 112 | PUBLISH=1 |
109 | 113 | ;; |
... | ... | @@ -118,7 +122,7 @@ do |
118 | 122 | echo "" |
119 | 123 | |
120 | 124 | if [ ! -z ${WIN_PACKAGE_SERVER} ]; then |
121 | - echo " --nopublish Don't publish in ${WIN_PACKAGE_SERVER}" | |
125 | + echo " --no-publish Don't publish in ${WIN_PACKAGE_SERVER}" | |
122 | 126 | echo " --publish Publish in ${WIN_PACKAGE_SERVER}" |
123 | 127 | fi |
124 | 128 | ... | ... |