Previous

199869 Revisions

Next

r41810 Saturday 21st November, 2015 at 09:40:59 UTC by Justin Kerk
Emscripten build fixes (nw)

[/trunk]	makefile
[scripts/src]	3rdparty.lua
[scripts/src/osd]	modules.lua

trunk/makefile

r250321	r250322
327	327	ifeq ($(TARGETOS),os2)
328	328	OSD := sdl
329	329	endif
	330
	331	ifeq ($(TARGETOS),asmjs)
	332	OSD := sdl
330	333	endif
	334	endif
331	335
332	336	#-------------------------------------------------
333	337	# which 3rdparty library to build;

trunk/scripts/src/3rdparty.lua

r250321	r250322
371	371	defines {
372	372	"LUA_COMPAT_ALL",
373	373	}
374		if not (_OPTIONS["targetos"]=="windows") then
	374	if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
375	375	defines {
376	376	"LUA_USE_POSIX",
377	377	}

trunk/scripts/src/osd/modules.lua

r250321	r250322
356	356	}
357	357
358	358	if not _OPTIONS["NO_USE_MIDI"] then
359		if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
	359	if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
360	360	_OPTIONS["NO_USE_MIDI"] = "1"
361	361	else
362	362	_OPTIONS["NO_USE_MIDI"] = "0"
r250321	r250322
379	379
380	380
381	381	if not _OPTIONS["USE_QTDEBUG"] then
382		if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "emscripten" or _OPTIONS["targetos"] == "os2" then
	382	if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
383	383	_OPTIONS["USE_QTDEBUG"] = "0"
384	384	else
385	385	_OPTIONS["USE_QTDEBUG"] = "1"

https://github.com/mamedev/mame/commit/078d8e099a36df8667772b2b1524fd339defabcc

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team