claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some things from the makefile - should fix the Dev builds;

Browse Source 
Removed some unused code from pic.c;
Updated Jenkins' development environment, 86Box builds will now be compiled using GCC 9.2.0-2.
This commit is contained in:
OBattler
2019-09-20 15:00:18 +02:00
parent 552a87ea3d
commit 5a4f81d538
3 changed files with 1 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/win/Makefile.mingw
View File

@@ -71,9 +71,6 @@ ifeq ($(DEV_BUILD), y)
ifndef PS2M70T4
PS2M70T4 := y
endif
ifndef RIVA128
RIVA128 := y
endif
ifndef TC430HX
TC430HX := y
endif
@@ -129,9 +126,6 @@ else
ifndef PS2M70T4
PS2M70T4 := n
endif
ifndef RIVA128
RIVA128 := n
endif
ifndef TC430HX
TC430HX := n
endif
@@ -482,11 +476,6 @@ ifeq ($(PS2M70T4), y)
OPTS += -DUSE_PS2M70T4
endif
ifeq ($(RIVA128), y)
OPTS += -DUSE_RIVA128
DEVBROBJ += vid_riva128.o
endif
ifeq ($(TC430HX), y)
OPTS += -DUSE_TC430HX
endif

11
src/win/Makefile_ndr.mingw
View File

@@ -71,9 +71,6 @@ ifeq ($(DEV_BUILD), y)
ifndef PS2M70T4
PS2M70T4 := y
endif
ifndef RIVA128
RIVA128 := y
endif
ifndef TC430HX
TC430HX := y
endif
@@ -129,9 +126,6 @@ else
ifndef PS2M70T4
PS2M70T4 := n
endif
ifndef RIVA128
RIVA128 := n
endif
ifndef TC430HX
TC430HX := n
endif
@@ -488,11 +482,6 @@ ifeq ($(PS2M70T4), y)
OPTS += -DUSE_PS2M70T4
endif
ifeq ($(RIVA128), y)
OPTS += -DUSE_RIVA128
DEVBROBJ += vid_riva128.o
endif
ifeq ($(TC430HX), y)
OPTS += -DUSE_TC430HX
endif