Changed --W arch to -W arch, fix win not executing

This commit is contained in:
Antonin Décimo
2015-07-09 11:29:51 +02:00
parent a078106148
commit 661f041216
3 changed files with 14 additions and 11 deletions

View File

@@ -68,8 +68,8 @@ See the `conf.lua` file included to see how configuration works.
Remember that x86 is always backwards compatible with x64. Remember that x86 is always backwards compatible with x64.
Depending on the Love version used, the script will choose which one, Depending on the Love version used, the script will choose which one,
between x64 and x86 or x86 only to create. between x64 and x86 or x86 only to create.
`--W32` Create Windows x86 executable only `-W32` Create Windows x86 executable only
`--W64` Create Windows x64 executable only `-W64` Create Windows x64 executable only
#### PROJECT OPTIONS #### PROJECT OPTIONS
You can use the option of a module and append a long option from this list to set a specific You can use the option of a module and append a long option from this list to set a specific

View File

@@ -46,7 +46,7 @@ If you are targeting one of these, your project must be developed with Love 0.8.
Depending on the Love version used, the script will choose which one, Depending on the Love version used, the script will choose which one,
between x64 only or Universal Build to create. between x64 only or Universal Build to create.
.TP .TP
.BR \-W .BR \-W \fIarch\fR
Create Windows application. Create Windows application.
Starting with Love 0.8.0, a release is specially available for Windows x64. Starting with Love 0.8.0, a release is specially available for Windows x64.
If you are targeting one of these, your project must be developed with Love 0.8.0 or newer. If you are targeting one of these, your project must be developed with Love 0.8.0 or newer.
@@ -54,10 +54,10 @@ Remember that x86 is always backwards compatible with x64.
Depending on the Love version used, the script will choose which one, Depending on the Love version used, the script will choose which one,
between x64 and x86 or x86 only to create. between x64 and x86 or x86 only to create.
.br .br
.B \-\-W32 .B \-W32
Create Windows x86 executable only. Create Windows x86 executable only.
.br .br
.B \-\-W64 .B \-W64
Create Windows x64 executable only. Create Windows x64 executable only.
.SH PROJECT OPTIONS .SH PROJECT OPTIONS
You can use the option of a module and append a long option from this list to set a specific You can use the option of a module and append a long option from this list to set a specific

View File

@@ -1,7 +1,7 @@
# Windows # Windows
init_module "Windows" "windows" "W" init_module "Windows" "windows" "W"
OPTIONS="W" OPTIONS="W::"
LONG_OPTIONS="appid:,installer,32,64" LONG_OPTIONS="appid:,installer"
if [[ -z $IDENTITY ]]; then if [[ -z $IDENTITY ]]; then
IDENTITY=$(echo $IDENTITY | sed -e 's/[^-a-zA-Z0-9_]/-/g' | tr '[:upper:]' '[:lower:]') IDENTITY=$(echo $IDENTITY | sed -e 's/[^-a-zA-Z0-9_]/-/g' | tr '[:upper:]' '[:lower:]')
@@ -11,8 +11,10 @@ while true; do
case "$1" in case "$1" in
--Wappid ) APPID="$2"; shift 2 ;; --Wappid ) APPID="$2"; shift 2 ;;
--Winstaller ) INSTALLER=true; shift ;; --Winstaller ) INSTALLER=true; shift ;;
--W32 ) X32=true; shift ;; -W ) if [[ -z "$2" ]]; then X32=true; X64=true;
--W64 ) X64=true; shift ;; elif (( "$2" == 32 )); then X32=true;
elif (( "$2" == 64 )); then X64=true;
fi; shift ;;
-- ) break ;; -- ) break ;;
* ) shift ;; * ) shift ;;
esac esac
@@ -156,8 +158,9 @@ EOF
fi fi
${X32:=false}
if [[ ${X32:=false} == false && ${X64:=false} == false ]]; then ${X64:=false}
if [[ $X32 == false && $X64 == false ]]; then
X32=true X32=true
X64=true X64=true
fi fi