summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/main.lua
diff options
context:
space:
mode:
author motoschifo <motoschifo@users.noreply.github.com>2016-02-07 10:18:44 +0100
committer motoschifo <motoschifo@users.noreply.github.com>2016-02-07 10:18:44 +0100
commit44f98845f7bd276a8db6a413e08981c2a44b1d38 (patch)
tree0d4547b361b228c17d535b2fa756ec0a52356e6b /scripts/src/main.lua
parent38e15d788531b8eef8bc3d1c2c9814b9008f61e0 (diff)
parent5bc83a25063330ab9177a291ab984c5c7052aa02 (diff)
Merge pull request #1 from mamedev/master
Update to 0.170
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r--scripts/src/main.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index df5e77641a3..2397a489e00 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -44,7 +44,7 @@ end
flags {
"Unicode",
}
-if (_OPTIONS["SOURCES"] == nil) then
+
configuration { "x64", "Release" }
targetsuffix "64"
if _OPTIONS["PROFILE"] then
@@ -80,7 +80,7 @@ if (_OPTIONS["SOURCES"] == nil) then
if _OPTIONS["PROFILE"] then
targetsuffix "dp"
end
-end
+
configuration { "mingw*" or "vs*" }
targetextension ".exe"
@@ -88,7 +88,7 @@ end
targetextension ".bc"
if os.getenv("EMSCRIPTEN") then
postbuildcommands {
- os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js",
+ os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js",
}
end
@@ -129,6 +129,8 @@ end
"7z",
"lua",
"lsqlite3",
+ "uv",
+ "http-parser",
}
if _OPTIONS["with-bundled-zlib"] then