summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2013-06-10 19:33:46 +0000
committer smf- <smf-@users.noreply.github.com>2013-06-10 19:33:46 +0000
commit603f354635230221498ddac8bbcc47c066f9677d (patch)
treeda8fcd00aa01c8a970188e6c12dce5698bf0c067 /makefile
parentb58b1ddc28b3b9de0e703de3a1cc3e6d2e18741d (diff)
Added support to jedutil for decoding 82S153, PLS153 & CK2605 [Kevin Eshbach, Charles MacDonald]
Diffstat (limited to 'makefile')
-rw-r--r--makefile30
1 files changed, 14 insertions, 16 deletions
diff --git a/makefile b/makefile
index e94f085e05e..cc76b0ca967 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@
#-------------------------------------------------
# specify core target: mame, mess, etc.
# specify subtarget: mame, mess, tiny, etc.
-# build rules will be included from
+# build rules will be included from
# src/$(TARGET)/$(SUBTARGET).mak
#-------------------------------------------------
@@ -35,7 +35,7 @@ endif
#-------------------------------------------------
# specify OSD layer: windows, sdl, etc.
-# build rules will be included from
+# build rules will be included from
# src/osd/$(OSD)/$(OSD).mak
#-------------------------------------------------
@@ -129,7 +129,7 @@ endif
endif # BIGENDIAN
endif # OS/2
-endif # CROSS_BUILD
+endif # CROSS_BUILD
endif # Windows_NT
endif # TARGET_OS
@@ -177,7 +177,7 @@ endif
#-------------------------------------------------
-# specify program options; see each option below
+# specify program options; see each option below
# for details
#-------------------------------------------------
@@ -642,7 +642,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARGET)/drivlist.o
#-------------------------------------------------
-# either build or link against the included
+# either build or link against the included
# libraries
#-------------------------------------------------
@@ -709,7 +709,7 @@ LIBS += -lstdc++ -lpthread
endif
#-------------------------------------------------
-# 'default' target needs to go here, before the
+# 'default' target needs to go here, before the
# include files which define additional targets
#-------------------------------------------------
@@ -717,17 +717,12 @@ default: maketree buildtools emulator
all: default tools
-# TODO: move to a .mak file in the regtests folder?
tests: maketree jedutil$(EXE) chdman$(EXE)
- @echo Running jedutil unittest
- $(PYTHON) src/regtests/jedutil/jedtest.py
- @echo Running chdman unittest
- $(PYTHON) src/regtests/chdman/chdtest.py
-7Z_LIB = $(OBJ)/lib7z.a
+7Z_LIB = $(OBJ)/lib7z.a
#-------------------------------------------------
-# defines needed by multiple make files
+# defines needed by multiple make files
#-------------------------------------------------
BUILDSRC = $(SRC)/build
@@ -751,6 +746,7 @@ include $(SRC)/emu/emu.mak
include $(SRC)/lib/lib.mak
-include $(SRC)/osd/$(CROSS_BUILD_OSD)/build.mak
include $(SRC)/tools/tools.mak
+include $(SRC)/regtests/regtests.mak
# combine the various definitions to one
CCOMFLAGS += $(INCPATH)
@@ -793,11 +789,13 @@ ifdef SYMBOLS
endif
checkautodetect:
- @echo TARGETOS=$(TARGETOS)
- @echo PTR64=$(PTR64)
- @echo BIGENDIAN=$(BIGENDIAN)
+ @echo TARGETOS=$(TARGETOS)
+ @echo PTR64=$(PTR64)
+ @echo BIGENDIAN=$(BIGENDIAN)
@echo UNAME="$(UNAME)"
+tests: $(REGTESTS)
+
#-------------------------------------------------
# directory targets