Small improvements, changed x86 to x32

This commit is contained in:
Antonin Décimo
2015-06-15 23:50:46 +02:00
parent 72ada933f1
commit 6e58597f36
2 changed files with 10 additions and 11 deletions

View File

@@ -18,7 +18,7 @@ function love.conf(t)
t.os = { t.os = {
"love", "love",
windows = { windows = {
x86 = true, x32 = true,
x64 = true, x64 = true,
installer = false, installer = false,
appid = nil, appid = nil,

View File

@@ -205,11 +205,11 @@ else
end end
if t.os.windows and os == "windows" then if t.os.windows and os == "windows" then
t.os.windows.x86 = t.os.windows.x86 and true or false t.os.windows.x32 = t.os.windows.x32 and true or false
t.os.windows.x64 = t.os.windows.x64 and true or false t.os.windows.x64 = t.os.windows.x64 and true or false
t.os.windows.installer = t.os.windows.installer and true or false t.os.windows.installer = t.os.windows.installer and true or false
t.os.windows.appid = t.os.windows.appid or "" t.os.windows.appid = t.os.windows.appid or ""
print("X86="..tostring(t.os.windows.x86)) print("X32="..tostring(t.os.windows.x32))
print("X64="..tostring(t.os.windows.x64)) print("X64="..tostring(t.os.windows.x64))
print("INSTALLER="..tostring(t.os.windows.installer)) print("INSTALLER="..tostring(t.os.windows.installer))
print("APPID="..t.os.windows.appid) print("APPID="..t.os.windows.appid)
@@ -217,13 +217,6 @@ end
EOF EOF
) )
eval "$var" eval "$var"
if [[ $(compare_version "$LOVE_VERSION" ">" "$VERSION") == true ]]; then
if [[ $(get_user_confirmation "LÖVE $LOVE_VERSION is out ! Your project uses LÖVE $VERSION. Continue ?") == false ]]; then
exit
fi
gen_version $VERSION
unset VERSION
fi
fi fi
} }
@@ -256,7 +249,6 @@ execute_module ()
{ {
reset_vars reset_vars
local module="$1" local module="$1"
MODULE="$module"
read_config "$module" read_config "$module"
module=${module^^} module=${module^^}
if [[ ${!module} == true ]]; then if [[ ${!module} == true ]]; then
@@ -267,6 +259,13 @@ execute_module ()
DEFAULT_MODULE=false DEFAULT_MODULE=false
fi fi
fi fi
if [[ $(compare_version "$LOVE_VERSION" ">" "$VERSION") == true ]]; then
if [[ $(get_user_confirmation "LÖVE $LOVE_VERSION is out ! Your project uses LÖVE $VERSION. Continue ?") == false ]]; then
exit
fi
gen_version $VERSION
unset VERSION
fi
else else
reset_vars reset_vars
fi fi