| Previous | 199869 Revisions | Next |
| r34275 Friday 9th January, 2015 at 02:25:46 UTC by Couriersud |
|---|
| Move definition of -DOSD_WINDOWS, -DOSD_SDL and -DOSD_MINI into $(OSD).mak. Added sanity check to makefile. [Couriersud] |
| [/trunk] | makefile |
| [src/osd/osdmini] | osdmini.mak |
| [src/osd/sdl] | sdl.mak |
| [src/osd/windows] | windows.mak |
| r242786 | r242787 | |
|---|---|---|
| 490 | 490 | DEFS += -DMAME_DEBUG_FAST |
| 491 | 491 | endif |
| 492 | 492 | |
| 493 | # add a define identifying the target osd | |
| 494 | ||
| 495 | ifeq ($(OSD),sdl) | |
| 496 | DEFS += -DOSD_SDL | |
| 497 | else | |
| 498 | ifeq ($(OSD),windows) | |
| 499 | DEFS += -DOSD_WINDOWS | |
| 500 | else | |
| 501 | ifeq ($(OSD),winui) | |
| 502 | DEFS += -DOSD_WINDOWS | |
| 503 | else | |
| 504 | ifeq ($(OSD),osdmini) | |
| 505 | DEFS += -DOSD_MINI | |
| 506 | else | |
| 507 | $(warning Please add -DOSD_[SDL|WINDOWS|MINI] in $(OSD).mak) | |
| 508 | endif | |
| 509 | endif | |
| 510 | endif | |
| 511 | endif | |
| 512 | ||
| 513 | 493 | #------------------------------------------------- |
| 514 | 494 | # compile flags |
| 515 | 495 | # CCOMFLAGS are common flags |
| r242786 | r242787 | |
| 885 | 865 | # TODO: -x c++ should not be hard-coded |
| 886 | 866 | CPPCHECKFLAGS = $(CDEFS) $(INCPATH) -x c++ --enable=style |
| 887 | 867 | |
| 868 | #------------------------------------------------- | |
| 869 | # sanity check OSD additions | |
| 870 | #------------------------------------------------- | |
| 888 | 871 | |
| 872 | ifeq (,$(findstring -DOSD_,$(CDEFS))) | |
| 873 | $(error $(OSD).mak should have defined -DOSD_) | |
| 874 | endif | |
| 875 | ||
| 889 | 876 | #------------------------------------------------- |
| 890 | 877 | # primary targets |
| 891 | 878 | #------------------------------------------------- |
| r242786 | r242787 | |
|---|---|---|
| 37 | 37 | # |
| 38 | 38 | ########################################################################### |
| 39 | 39 | |
| 40 | # add a define identifying the target osd | |
| 41 | DEFS += -DOSD_MINI | |
| 40 | 42 | |
| 41 | 43 | #------------------------------------------------- |
| 42 | 44 | # object and source roots |
| r242786 | r242787 | |
|---|---|---|
| 86 | 86 | OSDSRC = $(SRC)/osd |
| 87 | 87 | OSDOBJ = $(OBJ)/osd |
| 88 | 88 | |
| 89 | # add a define identifying the target osd | |
| 90 | DEFS += -DOSD_SDL | |
| 91 | ||
| 89 | 92 | # default to SDL2 for non-OS/2, non-Emscripten builds now |
| 90 | 93 | ifndef SDL_LIBVER |
| 91 | 94 | ifneq ($(TARGETOS),os2) |
| r242786 | r242787 | |
|---|---|---|
| 73 | 73 | ################## END USER-CONFIGURABLE OPTIONS ###################### |
| 74 | 74 | ########################################################################### |
| 75 | 75 | |
| 76 | # add a define identifying the target osd | |
| 77 | DEFS += -DOSD_WINDOWS | |
| 76 | 78 | |
| 79 | ||
| 77 | 80 | #------------------------------------------------- |
| 78 | 81 | # object and source roots |
| 79 | 82 | #------------------------------------------------- |
| https://github.com/mamedev/mame/commit/799d10beb3990f12bfada276b9810d901b02e18f |
| Previous | 199869 Revisions | Next |