Previous 199869 Revisions Next

r36692 Thursday 26th March, 2015 at 21:40:11 UTC by Couriersud
Make GCC_VERSION work with $(CC). (nw)
[/trunk]makefile
[scripts]genie.lua
[scripts/src]cpu.lua

trunk/makefile
r245203r245204
304304PYTHON_AVAILABLE:=$(shell python --version > NUL 2>&1 && echo python)
305305CHECK_CLANG:=
306306else
307GCC_VERSION:=$(shell gcc -dumpversion 2> /dev/null)
307GCC_VERSION:=$(shell $(subst @,,$(CC)) -dumpversion 2> /dev/null)
308308CLANG_VERSION:=$(shell clang --version  2> /dev/null | grep 'LLVM [0-9]\.[0-9]' -o | grep '[0-9]\.[0-9]' -o | head -n 1)
309309PYTHON_AVAILABLE:=$(shell python --version > /dev/null 2>&1 && echo python)
310310CHECK_CLANG:=$(shell gcc --version  2> /dev/null | grep 'clang' | head -n 1)
r245203r245204
724724
725725$(GENDIR)/%.moc.c: $(SRC)/%.h
726726   $(SILENT) $(MOC) $(MOCINCPATH) $< -o $@
727   
No newline at end of file
trunk/scripts/genie.lua
r245203r245204
154154   description = "Generate a link map.",
155155}
156156
157newoption {
158   trigger = "FORCE_DRC_C_BACKEND",
159   description = "Force DRC C backend.",
160}
161
162
163157local os_version = str_to_version(_OPTIONS["os_version"])
164158USE_BGFX = 1
165159if (_OPTIONS["targetos"]=="macosx" and  os_version < 100700) then
r245203r245204
343337      "FLAC__NO_DLL",
344338   }
345339
346   -- fixme -- need to make this work for other target architectures (PPC)
347   if _OPTIONS["FORCE_DRC_C_BACKEND"]==nil then
348      configuration { "x64" }
349         defines {
350            "NATIVE_DRC=drcbe_x64",
351         }
352      configuration { "x32" }
353         defines {
354            "NATIVE_DRC=drcbe_x86",
355         }
356      configuration {  }
357   end
358   
359340-- define USE_SYSTEM_JPEGLIB if library shipped with MAME is not used
360341--ifneq ($(BUILD_JPEGLIB),1)
361342--DEFS += -DUSE_SYSTEM_JPEGLIB
trunk/scripts/src/cpu.lua
r245203r245204
3636   }
3737end
3838
39-- fixme -- need to make this work for other target architectures (PPC)
40
41--ifndef FORCE_DRC_C_BACKEND
42configuration { "x64" }
43   defines { "NATIVE_DRC=drcbe_x64" }
44   
45configuration { "x32" }
46   defines { "NATIVE_DRC=drcbe_x86" }
47--endif
48configuration { }
49
50
3951--------------------------------------------------
4052-- Signetics 8X300 / Scientific Micro Systems SMS300
4153--@src/emu/cpu/8x300/8x300.h,CPUS += 8X300


Previous 199869 Revisions Next


© 1997-2024 The MAME Team