diff options
author | Vas Crabb <vas@vastheman.com> | 2015-04-01 07:29:40 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2015-04-01 07:29:54 +1100 |
commit | 4d84885a297112c7f048b0137956d40c7be0dbf9 (patch) | |
tree | d061c9540f3b8ef43f2741ed6807792af55efb6e /makefile | |
parent | 29b6f9b84c0b674c020f5fe7c0ca38f72d2e7bd1 (diff) |
Refactor out common OSD modules into separate lua file
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 24 |
1 files changed, 10 insertions, 14 deletions
@@ -293,15 +293,6 @@ ifdef TARGETOS PARAMS += --targetos=$(TARGETOS) endif -ifndef USE_QT -ifneq ($(TARGETOS),macosx) -USE_QT := 1 -else -USE_QT := 0 -endif -endif -PARAMS += --USE_QT=$(USE_QT) - ifdef DONT_USE_NETWORK PARAMS += --DONT_USE_NETWORK='$(DONT_USE_NETWORK)' endif @@ -314,6 +305,14 @@ ifdef USE_DISPATCH_GL PARAMS += --USE_DISPATCH_GL='$(USE_DISPATCH_GL)' endif +ifdef NO_USE_MIDI +PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)' +endif + +ifdef USE_QTDEBUG +PARAMS += --USE_QTDEBUG='$(USE_QTDEBUG)' +endif + ifdef MESA_INSTALL_ROOT PARAMS += --MESA_INSTALL_ROOT='$(MESA_INSTALL_ROOT)' endif @@ -326,10 +325,6 @@ ifdef NO_USE_XINPUT PARAMS += --NO_USE_XINPUT='$(NO_USE_XINPUT)' endif -ifdef NO_USE_MIDI -PARAMS += --NO_USE_MIDI='$(NO_USE_MIDI)' -endif - ifdef SDL_LIBVER PARAMS += --SDL_LIBVER='$(SDL_LIBVER)' endif @@ -710,7 +705,8 @@ GEN_FOLDERS := \ LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/$(TARGET)/layout/*.lay) -ifeq ($(USE_QT),0) +# TODO: this will attempt to build on many platforms lacking Qt, e.g. emscripten and OS/2 +ifneq ($(TARGETOS),macosx) MOC_FILES= else MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h) |