Merge pull request #158 from MoochMcGee/experimental

Fix build
This commit is contained in:
OBattler
2017-07-27 21:59:47 +02:00
committed by GitHub

View File

@@ -250,11 +250,11 @@ WINOBJ = win.o \
win_settings.o win_deviceconfig.o win_joystickconfig.o \
86Box.res
ifdef DEV_BRANCH
DEVOBJ = vid_nv_riva128.o
DEVBRANCHOBJ = vid_nv_riva128.o
endif
OBJ = $(MAINOBJ) $(CPUOBJ) $(SYSOBJ) $(DEVOBJ) $(USBOBJ) \
$(NETOBJ) $(SCSIOBJ) $(SNDOBJ) $(VIDOBJ) $(WINOBJ) \
$(DEVOBJ)
$(DEVBRANCHOBJ)
LZFOBJ = lzf_c.o lzf_d.o