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

Fix up some stuff

Browse Source
This commit is contained in:
Melissa Goad
2017-06-07 13:58:44 -05:00
parent cdbee3c33e
commit aa2fdc8f6d
2 changed files with 13 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.mingw
View File

@@ -24,13 +24,7 @@ endif
# Various compile-time options.
# -DROM_TRACE=0xcd800 traces ROM access from segment C800
# -DIO_TACE=0x66 traces I/O on port 0x66
<<<<<<< HEAD
STUFF = -DDEV_BRANCH
=======
ifndef STUFF
STUFF =
endif
>>>>>>> master
# Add feature selections here.
# -DANSI_CFG forces the config file to ANSI encoding.