From: nhmall Date: Tue, 29 Jan 2019 16:31:41 +0000 (-0500) Subject: build bits - mostly for Windows X-Git-Tag: NetHack-3.6.2_Released~77^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97fdc3f3e488aed1b2bf8c63f92fd3120900fef1;p=nethack build bits - mostly for Windows Allow sys/share/random.c to be included in the build always, even if USE_ISAAC64 is defined, by making most of its contents conditional in that case. That avoids Makefile tinkering when going back and forth between USE_ISAAC64 and not during testing. --- diff --git a/sys/share/random.c b/sys/share/random.c index 6d3d5e45c..cc865c4e5 100644 --- a/sys/share/random.c +++ b/sys/share/random.c @@ -38,6 +38,8 @@ #include "hack.h" +#if defined(USE_ISAAC64) && !defined(RANDOM) +#else #ifdef LIBC_SCCS #ifndef lint static char sccsid[] = "@(#)random.c 5.5 (Berkeley) 7/6/88"; @@ -377,3 +379,7 @@ random() } return (i); } +#endif /* else defined(USE_ISAAC64) && !defined(RANDOM) */ + + + diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 97001da6e..9dd482218 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -129,13 +129,9 @@ OBJ = o # (see pcconf.h). Set to nothing if not used. # -RANDOM = $(OBJ)\isaac64.o -#RANDOM = $(OBJ)\random.o +RANDOM = $(OBJ)\random.o #RANDOM = -BCRYPT= -! IF ("$(RANDOM)"=="$(OBJ)\isaac64.o") BCRYPT=bcrypt.lib -! ENDIF WINPFLAG= -DTILES -DMSWIN_GRAPHICS -DWIN32CON # To store all the level files, @@ -223,7 +219,7 @@ VOBJ10 = $(O)mail.o $(O)makemon.o $(O)mapglyph.o $(O)mcastu.o VOBJ11 = $(O)mhitm.o $(O)mhitu.o $(O)minion.o $(O)mklev.o VOBJ12 = $(O)mkmap.o $(O)mkmaze.o $(O)mkobj.o $(O)mkroom.o VOBJ13 = $(O)mon.o $(O)mondata.o $(O)monmove.o $(O)monst.o -VOBJ14 = $(O)mplayer.o $(O)mthrowu.o $(O)muse.o +VOBJ14 = $(O)mplayer.o $(O)mthrowu.o $(O)muse.o $(O)isaac64.o VOBJ15 = $(O)music.o $(O)o_init.o $(O)objects.o $(O)objnam.o VOBJ16 = $(O)options.o $(O)pager.o $(O)pickup.o $(O)pline.o VOBJ17 = $(O)polyself.o $(O)potion.o $(O)pray.o $(O)priest.o diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj index 3a4412efe..be83d0a86 100644 --- a/win/win32/vs2017/NetHack.vcxproj +++ b/win/win32/vs2017/NetHack.vcxproj @@ -152,6 +152,7 @@ + diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj index e801b1583..a50dccb3a 100644 --- a/win/win32/vs2017/NetHackW.vcxproj +++ b/win/win32/vs2017/NetHackW.vcxproj @@ -147,6 +147,7 @@ + TTYSTUB;