Commit Graph
12 Commits
Author SHA1 Message Date
nhmall ed783b9940 yet more integration bits (thanks to my typo) 2015-04-12 16:48:06 -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
nhmall 5905a17242 visual studio mods for tribute, sysconf
Changes to be committed:
	modified:   win/win32/mhmenu.h
	modified:   win/win32/vs2013/NetHack.vcxproj
	modified:   win/win32/vs2013/NetHackW.vcxproj
	modified:   win/win32/vs2013/dlb_main.vcxproj
2015-04-12 10:58:13 -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 6ebb7db138 fix build order for nhdefkey, add to nhsetup
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
2015-02-28 22:56:03 -05:00
nhmall 4794329e89 Ensure nethack.exe gets copied to binary folder after it is built 2015-02-28 13:17:55 -05:00
nhmall 5411039780 more work on getting nethack.exe to build along with nethackw.exe via VS 2015-02-28 11:44:08 -05:00
nhmall 1b980f34ac adjust project dependencies to ensure makedefs builds before nethack.exe 2015-02-28 00:52:00 -05:00
nhmall 796f6f85d0 VS 2013 build of NetHack.exe and also fix level file locking 2015-02-28 00:37:05 -05:00
Derek S. Ray 528e8b34e0 fix (hopefully) last few warnings; fix Release too
VS2013 _really_ doesn't like having shared directories for
any sort of intermediate files, and will generate a nice little
pile of useless warnings as a result.
2015-02-27 23:08:20 -05:00
Derek S. Ray 335bdeb042 clean up all the miscellaneous warnings
shared-intermediate-directory fixed
linker weirdness fixed
2015-02-27 22:26:59 -05: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