summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua7
-rw-r--r--scripts/src/main.lua18
2 files changed, 19 insertions, 6 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index cfaa171bf64..72e0d0c24f4 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -513,7 +513,7 @@ project "lualibs"
--------------------------------------------------
-- luv lua library objects
--------------------------------------------------
-
+if _OPTIONS["USE_LIBUV"]=="1" then
project "luv"
uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871"
kind "StaticLib"
@@ -567,7 +567,7 @@ project "luv"
MAME_DIR .. "3rdparty/luv/src/luv.c",
MAME_DIR .. "3rdparty/luv/src/luv.h",
}
-
+end
--------------------------------------------------
-- SQLite3 library objects
--------------------------------------------------
@@ -1007,6 +1007,7 @@ end
--------------------------------------------------
-- libuv library objects
--------------------------------------------------
+if _OPTIONS["USE_LIBUV"]=="1" then
project "uv"
uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0"
kind "StaticLib"
@@ -1196,7 +1197,7 @@ project "uv"
"-Wshadow"
}
end
-
+end
--------------------------------------------------
-- HTTP parser library objects
--------------------------------------------------
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index ad71d0a5cb7..2a4acab17a5 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -35,6 +35,14 @@ end
"EGL",
"GLESv2",
}
+ configuration { "pnacl" }
+ kind "ConsoleApp"
+ targetextension ".pexe"
+ links {
+ "ppapi",
+ "ppapi_gles2",
+ "pthread",
+ }
configuration { }
addprojectflags()
@@ -153,11 +161,15 @@ end
"7z",
"lua",
"lualibs",
- "luv",
- "uv",
- "http-parser",
}
+ if _OPTIONS["USE_LIBUV"]=="1" then
+ links {
+ "luv",
+ "uv",
+ "http-parser",
+ }
+ end
if _OPTIONS["with-bundled-zlib"] then
links {
"zlib",