Merge branch 'master' into master

This commit is contained in:
OBattler
2020-04-16 21:58:33 +02:00
committed by GitHub
39 changed files with 894 additions and 465 deletions

View File

@@ -915,6 +915,7 @@ BEGIN
IDS_2120 "Unable to initialize SDL, SDL2.dll is required"
IDS_2121 "Are you sure you want to hard reset the emulated machine?"
IDS_2122 "Are you sure you want to quit 86Box?"
IDS_2123 "Unable to initialize Ghostscript, gsdll32.dll is required for automatic convertion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript files (.ps)."
IDS_2124 "MO %i (%03i): %ls"
IDS_2125 "MO images (*.IM?)\0*.IM?\0All files (*.*)\0*.*\0"
END

View File

@@ -74,9 +74,6 @@ ifeq ($(DEV_BUILD), y)
ifndef TI
TI := y
endif
ifndef TC430HX
TC430HX := y
endif
ifndef VECTRA54
VECTRA54 := y
endif
@@ -141,9 +138,6 @@ else
ifndef TI
TI := n
endif
ifndef TC430HX
TC430HX := n
endif
ifndef VECTRA54
VECTRA54 := n
endif
@@ -493,10 +487,6 @@ ifeq ($(TI), y)
OPTS += -DUSE_TI
endif
ifeq ($(TC430HX), y)
OPTS += -DUSE_TC430HX
endif
ifeq ($(VECTRA54), y)
OPTS += -DUSE_VECTRA54
endif

View File

@@ -74,9 +74,6 @@ ifeq ($(DEV_BUILD), y)
ifndef TI
TI := y
endif
ifndef TC430HX
TC430HX := y
endif
ifndef VECTRA54
VECTRA54 := y
endif
@@ -141,9 +138,6 @@ else
ifndef TI
TI := n
endif
ifndef TC430HX
TC430HX := n
endif
ifndef VECTRA54
VECTRA54 := n
endif
@@ -502,10 +496,6 @@ ifeq ($(TI), y)
OPTS += -DUSE_TI
endif
ifeq ($(TC430HX), y)
OPTS += -DUSE_TC430HX
endif
ifeq ($(VECTRA54), y)
OPTS += -DUSE_VECTRA54
endif