summaryrefslogtreecommitdiffstats
path: root/makefile
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-04-15 15:19:24 +0200
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2016-04-15 15:19:24 +0200
commit59662e6c71625d3783bbdc351613f77358d57679 (patch) (github)
treef70c6c2ab8c864926e701d207ce4def1e5e51e33 /makefile
parenta83a3c4497f2e5c09d0deb7468bde645ffb3e89e (diff)
downloadmame-59662e6c71625d3783bbdc351613f77358d57679.tar.bz2
mame-59662e6c71625d3783bbdc351613f77358d57679.zip
moved osdsync to root of OSD, removed osdmini (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile21
1 files changed, 1 insertions, 20 deletions
diff --git a/makefile b/makefile
index 7ee690d18b3..df813945c4c 100644
--- a/makefile
+++ b/makefile
@@ -345,7 +345,7 @@ CXX:= $(SILENT)g++
ifndef OSD
-OSD := osdmini
+OSD := sdl
ifeq ($(TARGETOS),windows)
OSD := windows
@@ -874,7 +874,6 @@ else
FULLTARGET := $(TARGET)$(SUBTARGET)
endif
PROJECTDIR := $(BUILDDIR)/projects/$(OSD)/$(FULLTARGET)
-PROJECTDIR_MINI := $(BUILDDIR)/projects/osdmini/$(FULLTARGET)
PROJECTDIR_SDL := $(BUILDDIR)/projects/sdl/$(FULLTARGET)
PROJECTDIR_WIN := $(BUILDDIR)/projects/windows/$(FULLTARGET)
@@ -1158,24 +1157,6 @@ endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-asmjs config=$(CONFIG)
#-------------------------------------------------
-# PNaCl
-#-------------------------------------------------
-
-$(PROJECTDIR_MINI)/gmake-pnacl/Makefile: makefile $(SCRIPTS) $(GENIE)
-ifndef NACL_SDK_ROOT
- $(error NACL_SDK_ROOT is not set)
-endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=pnacl --gcc_version=3.7.0 --osd=osdmini --targetos=pnacl --NOASM=1 --USE_LIBUV=0 gmake
-
-.PHONY: pnacl
-pnacl: generate $(PROJECTDIR_MINI)/gmake-pnacl/Makefile
-ifndef NACL_SDK_ROOT
- $(error NACL_SDK_ROOT is not set)
-endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-pnacl config=$(CONFIG)
-
-#-------------------------------------------------
# gmake-linux
#-------------------------------------------------