nhmall
fa00bb060e
visual studio updates
2015-06-20 09:17:34 -04:00
nhmall
3d3ee78a0b
Merge branch 'master' into win32-x64-working
...
Conflicts:
src/files.c
src/potion.c
sys/winnt/Makefile.msc
Changes to be committed:
modified: .gitignore
modified: DEVEL/hooksdir/nhsub
modified: dat/.gitignore
modified: dat/opthelp
modified: doc/Guidebook.mn
modified: doc/Guidebook.tex
modified: doc/fixes35.0
modified: include/context.h
modified: include/decl.h
modified: include/extern.h
modified: include/flag.h
modified: include/hack.h
modified: include/patchlevel.h
modified: src/apply.c
modified: src/attrib.c
modified: src/decl.c
modified: src/do.c
modified: src/do_name.c
modified: src/dothrow.c
modified: src/eat.c
modified: src/files.c
modified: src/hack.c
modified: src/invent.c
modified: src/lock.c
modified: src/mklev.c
modified: src/mondata.c
modified: src/monmove.c
modified: src/music.c
modified: src/options.c
modified: src/potion.c
modified: src/pray.c
modified: src/sit.c
modified: src/sp_lev.c
modified: src/uhitm.c
modified: sys/share/posixregex.c
modified: sys/winnt/Makefile.msc
modified: util/.gitignore
modified: win/win32/vs2010/NetHackW.vcxproj
2015-04-14 18:23:48 -04:00
nhmall
7e781d4013
Merge branch 'master' into win32-x64-working
...
Conflicts:
include/config.h
src/options.c
2015-04-12 11:58:14 -04:00
Derek S. Ray
f448dfbbd6
add YY_NO_UNISTD_H into the levcomp projects
2015-04-10 23:52:15 -04:00
Derek S. Ray
2f8d6502fd
Initial changes to support both VS2010 and VS2013
...
Mostly it's just project formats, but VS2013 does require
parallel compilation to be turned off and synchronous
PDB writes to be turned on (since we reuse intermediate
output directories).
Cleaning that up is for some time in the future.
2015-02-27 16:00:58 -05:00
