makefile: added param to override ar
This commit is contained in:
parent
4d3afe00fc
commit
2247ffefa2
17
makefile
17
makefile
@ -90,6 +90,7 @@
|
|||||||
# OVERRIDE_CC = cc
|
# OVERRIDE_CC = cc
|
||||||
# OVERRIDE_CXX = c++
|
# OVERRIDE_CXX = c++
|
||||||
# OVERRIDE_LD = ld
|
# OVERRIDE_LD = ld
|
||||||
|
# OVERRIDE_AR = ar
|
||||||
|
|
||||||
# DEPRECATED = 0
|
# DEPRECATED = 0
|
||||||
# LTO = 1
|
# LTO = 1
|
||||||
@ -108,7 +109,7 @@
|
|||||||
# FORCE_VERSION_COMPILE = 1
|
# FORCE_VERSION_COMPILE = 1
|
||||||
|
|
||||||
# MSBUILD = 1
|
# MSBUILD = 1
|
||||||
# IGNORE_BAD_LOCALISATION=1
|
# IGNORE_BAD_LOCALISATION = 1
|
||||||
# PRECOMPILE = 0
|
# PRECOMPILE = 0
|
||||||
|
|
||||||
# DEBUG_DIR=c:\test\location
|
# DEBUG_DIR=c:\test\location
|
||||||
@ -238,6 +239,7 @@ endif
|
|||||||
# build scripts will be run from
|
# build scripts will be run from
|
||||||
# scripts/target/$(TARGET)/$(SUBTARGET).lua
|
# scripts/target/$(TARGET)/$(SUBTARGET).lua
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
ifdef PROJECT
|
ifdef PROJECT
|
||||||
PARAMS += --PROJECT='$(PROJECT)'
|
PARAMS += --PROJECT='$(PROJECT)'
|
||||||
TARGET := $(PROJECT)
|
TARGET := $(PROJECT)
|
||||||
@ -591,6 +593,12 @@ ifndef CROSS_BUILD
|
|||||||
LD := $(OVERRIDE_LD)
|
LD := $(OVERRIDE_LD)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef OVERRIDE_AR
|
||||||
|
PARAMS += --AR='$(OVERRIDE_AR)'
|
||||||
|
ifndef CROSS_BUILD
|
||||||
|
AR := $(OVERRIDE_AR)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# sanity check the configuration
|
# sanity check the configuration
|
||||||
@ -893,11 +901,11 @@ endif
|
|||||||
ifdef SANITIZE
|
ifdef SANITIZE
|
||||||
PARAMS += --SANITIZE='$(SANITIZE)'
|
PARAMS += --SANITIZE='$(SANITIZE)'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# All scripts
|
# All scripts
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
SCRIPTS = scripts/genie.lua \
|
SCRIPTS = scripts/genie.lua \
|
||||||
scripts/src/lib.lua \
|
scripts/src/lib.lua \
|
||||||
scripts/src/emu.lua \
|
scripts/src/emu.lua \
|
||||||
@ -1466,6 +1474,7 @@ xcode4-ios: generate
|
|||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# gmake-solaris
|
# gmake-solaris
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
ifndef CLANG_VERSION
|
ifndef CLANG_VERSION
|
||||||
$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
|
$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
|
||||||
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) $(MAKETYPE)
|
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(GCC_VERSION) $(MAKETYPE)
|
||||||
@ -1486,6 +1495,7 @@ solaris_x86: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
|
|||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# gmake-solaris-clang
|
# gmake-solaris-clang
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
ifdef CLANG_VERSION
|
ifdef CLANG_VERSION
|
||||||
$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
|
$(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile: makefile $(SCRIPTS) $(GENIE)
|
||||||
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
|
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=solaris --gcc_version=$(CLANG_VERSION) $(MAKETYPE)
|
||||||
@ -1503,7 +1513,6 @@ solaris_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-solaris/Makefile
|
|||||||
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 precompile
|
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32 precompile
|
||||||
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32
|
$(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-solaris config=$(CONFIG)32
|
||||||
|
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# gmake-freebsd
|
# gmake-freebsd
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
@ -1673,6 +1682,7 @@ endif
|
|||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# cmake
|
# cmake
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
|
||||||
.PHONY: cmake
|
.PHONY: cmake
|
||||||
cmake: generate
|
cmake: generate
|
||||||
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake
|
$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake
|
||||||
@ -1771,6 +1781,7 @@ ifdef IGNORE_BAD_LOCALISATION
|
|||||||
else
|
else
|
||||||
$(SILENT)$(PYTHON) scripts/build/msgfmt.py --output-file $@ $<
|
$(SILENT)$(PYTHON) scripts/build/msgfmt.py --output-file $@ $<
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
# Regression tests
|
# Regression tests
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
|
@ -202,6 +202,11 @@ newoption {
|
|||||||
description = "LD replacement",
|
description = "LD replacement",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
newoption {
|
||||||
|
trigger = "AR",
|
||||||
|
description = "AR replacement",
|
||||||
|
}
|
||||||
|
|
||||||
newoption {
|
newoption {
|
||||||
trigger = "TOOLCHAIN",
|
trigger = "TOOLCHAIN",
|
||||||
description = "Toolchain prefix"
|
description = "Toolchain prefix"
|
||||||
|
@ -488,6 +488,9 @@ function toolchain(_buildDir, _subDir)
|
|||||||
if (_OPTIONS["LD"] ~= nil) then
|
if (_OPTIONS["LD"] ~= nil) then
|
||||||
premake.gcc.ld = _OPTIONS["LD"]
|
premake.gcc.ld = _OPTIONS["LD"]
|
||||||
end
|
end
|
||||||
|
if (_OPTIONS["AR"] ~= nil) then
|
||||||
|
premake.gcc.ar = _OPTIONS["AR"]
|
||||||
|
end
|
||||||
|
|
||||||
configuration {} -- reset configuration
|
configuration {} -- reset configuration
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ Scorpio 68000 hardware is very similar, but with chessboard buttons and side led
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "emu.h"
|
#include "emu.h"
|
||||||
|
|
||||||
#include "bus/rs232/rs232.h"
|
#include "bus/rs232/rs232.h"
|
||||||
#include "cpu/m68000/m68000.h"
|
#include "cpu/m68000/m68000.h"
|
||||||
#include "machine/sensorboard.h"
|
#include "machine/sensorboard.h"
|
||||||
@ -94,22 +95,15 @@ private:
|
|||||||
HD44780_PIXEL_UPDATE(lcd_pixel_update);
|
HD44780_PIXEL_UPDATE(lcd_pixel_update);
|
||||||
void lcd_palette(palette_device &palette) const;
|
void lcd_palette(palette_device &palette) const;
|
||||||
|
|
||||||
u8 m_inp_mux;
|
u8 m_inp_mux = 0;
|
||||||
u8 m_led_data;
|
u8 m_led_data = 0;
|
||||||
u8 m_led_side;
|
u8 m_led_side = 0;
|
||||||
u8 m_lcd_control;
|
u8 m_lcd_control = 0;
|
||||||
u8 m_lcd_data;
|
u8 m_lcd_data = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
void diablo_state::machine_start()
|
void diablo_state::machine_start()
|
||||||
{
|
{
|
||||||
// zerofill
|
|
||||||
m_inp_mux = 0;
|
|
||||||
m_led_data = 0;
|
|
||||||
m_led_side = 0;
|
|
||||||
m_lcd_control = 0;
|
|
||||||
m_lcd_data = 0;
|
|
||||||
|
|
||||||
// register for savestates
|
// register for savestates
|
||||||
save_item(NAME(m_inp_mux));
|
save_item(NAME(m_inp_mux));
|
||||||
save_item(NAME(m_led_data));
|
save_item(NAME(m_led_data));
|
||||||
|
@ -37,6 +37,7 @@ TODO:
|
|||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "emu.h"
|
#include "emu.h"
|
||||||
|
|
||||||
#include "bus/rs232/rs232.h"
|
#include "bus/rs232/rs232.h"
|
||||||
#include "cpu/m6502/m65c02.h"
|
#include "cpu/m6502/m65c02.h"
|
||||||
#include "machine/sensorboard.h"
|
#include "machine/sensorboard.h"
|
||||||
@ -124,20 +125,14 @@ protected:
|
|||||||
HD44780_PIXEL_UPDATE(lcd_pixel_update);
|
HD44780_PIXEL_UPDATE(lcd_pixel_update);
|
||||||
void lcd_palette(palette_device &palette) const;
|
void lcd_palette(palette_device &palette) const;
|
||||||
|
|
||||||
u8 m_inp_mux;
|
u8 m_inp_mux = 0;
|
||||||
u8 m_led_data;
|
u8 m_led_data = 0;
|
||||||
u8 m_lcd_control;
|
u8 m_lcd_control = 0;
|
||||||
u8 m_lcd_data;
|
u8 m_lcd_data = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
void sexpert_state::machine_start()
|
void sexpert_state::machine_start()
|
||||||
{
|
{
|
||||||
// zerofill
|
|
||||||
m_inp_mux = 0;
|
|
||||||
m_led_data = 0;
|
|
||||||
m_lcd_control = 0;
|
|
||||||
m_lcd_data = 0;
|
|
||||||
|
|
||||||
// register for savestates
|
// register for savestates
|
||||||
save_item(NAME(m_inp_mux));
|
save_item(NAME(m_inp_mux));
|
||||||
save_item(NAME(m_led_data));
|
save_item(NAME(m_led_data));
|
||||||
|
Loading…
Reference in New Issue
Block a user