nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
11,457 Commits 2 Branches 0 Tags
bc7fb05dcfd019c00a5b5b5ee9a0e5c1e730e9bf
Commit Graph

23 Commits

Author SHA1 Message Date
Adam Powers
dc2d757399 libnethack pr385 
roll parts of pr385 into source tree

This does not take the PR as is.

Unlike the PR, this streamlines and minimizes the integration somewhat:

- use hints/include mechanism instead of creating alternative
  Makefile.dat, Makefile.src, Makefile.top, Makefile.utl in sys/lib;
  those would have been a maintenance nightmare.

- don't have alternative mkmkfile.sh and setup.sh in sys/lib.

- sys/lib/libnethackmain.c differed from sys/unix/unixmain.c by
  very little, so just place a small bit of conditional code at the
  top of sys/unix/unixmain.c instead.

- changed the conditional code bits from __EMSCRIPTEN__ to
  CROSS_TO_WASM.

- You should be able to build the wasm result by:
    cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../..
    make fetch-lua    (<-one time)
    make WANT_LIBNH all

- You should be able to build LIBNBH by:
    cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../..
    make fetch-lua    (<-one time)
    make CROSS_TO_WASM=1 all

As it is currently coded, winshim.c requires C99.
 2020-10-04 14:46:32 -04:00
nhmall
c1dd898df6 use curl which is always available on osx rather than wget 2019-11-24 13:37:22 -05:00
nhmall
a9f33df64a more support in cross-compile for the changes in this branch 2019-11-24 12:23:00 -05:00
nhmall
308ebea68e add some msdos files to .gitignore, produce zip 2019-11-23 10:13:10 -05:00
nhmall
8bd6ef629a update post-Lua 
add lib/ to .gitignore

add optional "make fetch-Lua" step to simplify prerequisite to "make all"
 2019-11-15 11:12:00 -05:00
Mike Allison
84c2d78a42 add .DS_Store to .gitignore 2018-11-18 23:37:49 -05:00
Bart House
26171ed9f5 Ignore .vs hidden folders generated by visual studio 2017. 2018-11-10 20:33:30 -05: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
Pasi Kallinen
ee5002210f Fix gitignored 2015-04-13 08:30:47 +03:00
Pasi Kallinen
323b8b4038 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp 
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
 2015-04-01 16:09:53 +03:00
Derek S. Ray
12ca92aa42 Fix 'fetch' syntax, include sparkly 'git log' trick 
And bolt a couple more Win32-folders onto .gitignore.
 2015-03-25 17:07:10 -04:00
Derek S. Ray
7f03ee4216 Changes for Win32; update precompiled files 
Also fix Orctown probabilities; fixed support for snprintf;
update Win32 makefile to allow level compiler use

Conflicts:
	win/win32/levstuff.mak
 2015-03-20 15:14:31 +02:00
Derek S. Ray
e1e55c31c7 more win32-specific pieces 2015-03-17 18:44:54 +02:00
Derek
4c496d089e Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-03-17 18:44:53 +02:00
Sean Hunt
ea46c93b88 +x .sh files in unix dir; ignore Makefiles 2015-03-17 18:44:52 +02:00
Derek S. Ray
3e94fa63c7 get rid of code-analysis clutter 2015-03-15 13:44:26 -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
Derek S. Ray
18ca81d963 token .gitignore change to differentiate branch 2015-02-26 21:57:47 -05:00
Derek S. Ray
d34bab1509 more win32-specific pieces 2015-02-15 14:45:36 -05:00
Derek
bae3c6088f Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-02-13 13:26:05 -05:00
Sean Hunt
967364b6ed +x .sh files in unix dir; ignore Makefiles 2015-02-13 11:39:37 -05:00
keni
b3c8089e55 .git* cleanup tids 2015-02-12 16:39:51 -05:00
jwalz
fce15e3213 initial checkin 2002-01-05 20:49:41 +00:00