Commit Graph
100 Commits
Author SHA1 Message Date
nhmall 36983e6889 more msdos cross-compile fixes
undefined reference to g.variables if certain parts of
drawing.c are included in host-side utilities, so
surround the offending code in
->  #if !defined(CROSSCOMPILE) || defined(CROSSCOMPILE_TARGET)
2019-11-26 00:02:38 -05:00
nhmall 7fcccdf5c6 linux-hosted msdos cross-compiler updates 2019-11-25 22:47:54 -05:00
nhmall 4ece8ef31d spelling bit 2019-11-25 11:42:24 -05:00
nhmall 94f251cf2a fixes catch-up bit 2019-11-25 11:30:21 -05:00
nhmall 05fdccd8a6 add placeholder Cross-compiling file to Top 2019-11-25 11:16:58 -05:00
nhmall a1276d3c8c README update 2019-11-25 11:12:27 -05:00
nhmall 88324a38d1 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-25 00:51:44 -05:00
nhmall cab3eabfc4 lua quest texts 2019-11-25 00:50:16 -05:00
nhmall f10e4218c6 msdos now has its own sysconf as the sys/winnt/sysconf.template had incompatible entries 2019-11-25 00:17:16 -05:00
nhmall a9425159eb fix a transcription error 2019-11-24 23:42:27 -05:00
nhmall d830f3578a Merge branch 'NetHack-3.7' into paxed-quest-lua 2019-11-24 23:11:30 -05:00
nhmall 2770df9c22 Merge branch 'NetHack-3.7' into paxed-quest-lua 2019-11-24 18:57:46 -05:00
nhmall c70fa3dfba Merge branch 'master' into NetHack-3.7 2019-11-24 18:57:11 -05:00
nhmall 47a24d507e Merge branch 'NetHack-3.6' 2019-11-24 18:55:18 -05:00
nhmall b070cb10ca Merge branch 'NetHack-3.6' 2019-11-24 18:51:59 -05:00
nhmall 2a187c47c7 more warnings 2019-11-24 18:01:48 -05:00
nhmall 5d778f7418 clean up some macosx build warnings 2019-11-24 17:26:35 -05:00
nhmall 95b6e27a09 add notice 2019-11-24 14:26:46 -05:00
nhmall 2bf7731e12 remove a debugging line from msdos-cross-compile.sh 2019-11-24 13:44:53 -05:00
nhmall 541f177408 Merge branch 'paxed-quest-lua' of https://rodney.nethack.org:20040/git/NHsource into paxed-quest-lua 2019-11-24 13:38:32 -05:00
nhmall c1dd898df6 use curl which is always available on osx rather than wget 2019-11-24 13:37:22 -05:00
nhmall 697084a72e Merge branch 'paxed-quest-lua' of https://rodney.nethack.org:20040/git/NHsource into paxed-quest-lua 2019-11-24 12:40:36 -05:00
nhmall e6f5899200 added protection in Makefile for cross-compile (although should not happen): 2019-11-24 12:39:00 -05:00
nhmall a9f33df64a more support in cross-compile for the changes in this branch 2019-11-24 12:23:00 -05:00
nhmall 0e7d62bcf5 remove warning for unused variable 2019-11-24 12:03:11 -05:00
nhmall c6fab3aad8 windows and msdos Makefile support of the changes in this branch 2019-11-24 12:01:33 -05:00
nhmall ac315adaf1 Revert "attempt to avoid questpgr convert woes on cross-compile by making the int sizes fixed"
This reverts commit b8a6d82c57.
2019-11-24 00:40:00 -05:00
nhmall b8a6d82c57 attempt to avoid questpgr convert woes on cross-compile by making the int sizes fixed 2019-11-24 00:11:26 -05:00
nhmall cc7f1185d8 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-23 18:58:34 -05:00
nhmall 8bc171ec50 more sys/msdos/Makefile?.cross updates 2019-11-23 18:57:17 -05:00
nhmall 55f2fa350d Merge branch 'NetHack-3.7' 2019-11-23 17:32:44 -05:00
nhmall 9ed1d8ad37 Merge branch 'NetHack-3.6' 2019-11-23 17:32:36 -05:00
nhmall db05de37fa Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-23 12:20:45 -05:00
nhmall 69136fbb98 more cross-compile djgpp build tweaks 2019-11-23 12:19:33 -05:00
nhmall 95c1ccd716 another cross-compile script bit 2019-11-23 10:20:18 -05:00
nhmall ad6ef85177 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-23 10:15:05 -05:00
nhmall 308ebea68e add some msdos files to .gitignore, produce zip 2019-11-23 10:13:10 -05:00
nhmall 89b315be47 Makefile?.cross bits 2019-11-23 08:49:55 -05:00
nhmall 856c0a23c3 Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-11-23 01:32:43 -05:00
nhmall 11678e72f2 fix an error with msdos cross-compiler NetHack packaging 2019-11-23 01:30:54 -05:00
nhmall 7de2a0d515 Merge branch 'NetHack-3.7' part 2 2019-11-22 23:41:21 -05:00
nhmall fe5c7b4292 Merge branch 'NetHack-3.7' 2019-11-22 23:38:02 -05:00
nhmall 0024ea5ce4 Merge branch 'NetHack-3.6' 2019-11-22 23:37:48 -05:00
nhmall 1e0c03b3f6 incremental improvements to cross-compiling support in NetHack 3.7
Some support of new code #defines to faciliate cross-compiling:

    OPTIONS_AT_RUNTIME    If this is defined, code to support obtaining
                          the compile time options and features is
                          included. If you define this, you'll also have
                          to compile sys/mdlib.c and link the resulting
                          object file into your game binary/executable.

    CROSSCOMPILE          Flags that this is a cross-compiled NetHack build,
                          where there are two stages:
                          1. makedefs and some other utilities are compiled
                          on the host platform and executed there to generate
                          some output files and header files needed by the
                          game.
                          2. the NetHack game files are compiled by a
                          cross-compiler to generate binary/executables for
                          a different platform than the one the build is
                          being run on. The executables produced for the
                          target platform may not be able to execute on the
                          build platform, except perhaps via a software
                          emulator.

                          The 2-stage process (1. host, 2.target) can be done
                          on the same platform to test the cross-compile
                          process. In that case, the host and target platforms
                          would be the same.

    CROSSCOMPILE_HOST     Separates/identifies code paths that should only be
                          be included in the compile on the host side, for
                          utilities that will be run on the host as part of
                          stage 1 to produce output files needed to build the
                          game. Examples are the code for makedefs, tile
                          conversion utilities, uudecode, dlb, etc.

    CROSSCOMPILE_TARGET   Separates/identifies code paths that should be
                          included on the build for the target platform
                          during stage 2, the cross-compiler stage. That
                          includes most of the pieces of the game itself
                          but the code is only flagged as such if it must
                          not execute on the host.

If you don't define any of those, things should build as before.
One follow-on change that is likely required is setting the new dependency
makedefs has on src/mdlib.c in Makefiles etc.

More information about the changes:

    makedefs

    - splinter off some of makedefs functionality into a separate file
      called src/mdlib.c.
        - src/mdlib.c, while included during the compile of makedefs.c
          for producing the makedefs utility, can also be compiled
          as a stand-alone object file for inclusion in the link step
          of your NetHack game build. The src/mdlib.c code can then
          deliver the same functionality that it provided to makedefs
          right to your NetHack game code at run-time.
          For example, do_runtime_info() will provide the caller with
          the features and options that were built into the game.
          Previously, that information was produced at build time on the
          host and stored in a dat file. Under a cross-compile situation,
          those values are highly suspect and might not even reflect the
          correct options and setting for the cross-compiled target
          platform's binary/executable. The compile of those values and
          the functionality to obtain them needs to move to the target
          cross-compiler stage of the build (stage 2).
        - date information on the target-side binary is produced from
          the cross-compiler preprocessor pre-defined macros __DATE__
          and __TIME__, as they reflect the actual compile time of the
          cross-compiled target and not host-side execution of a utility
          to produce them. The cross-compiler itself, through those
          pre-defined preprocessor macros, provides them to the target
          platform binary/executable. They reflect the actual build
          time of the target binary/executable (not values produced
          at the time the makefiles utility was built and the
          appropriate option selected to store them in a text file.)
        - most Makefiles should not require adding the new file
          src/mdlib.c because util/makedefs.c has a preprocessor
          include "../src/mdlib.c" to draw in its contents. As previously
          stated though, the Makefile dependency may be required:
		makedefs.o: ../util/makedefs.c ../src/mdlib.c
                                               ^^^^^^^^^^^^^^^
2019-11-22 22:35:48 -05:00
nhmall c9e7182f43 Merge branch 'NetHack-3.6' 2019-11-22 07:46:42 -05:00
nhmall c8af8e23c1 slash vs backslash Makefile bit 2019-11-22 07:45:43 -05:00
nhmall fa4552e09e Merge branch 'NetHack-3.6' 2019-11-22 07:41:53 -05:00
nhmall 7af4797671 when decl.h changes, ensure windmain is rebuilt 2019-11-22 07:40:17 -05:00
nhmall 39bc7e9bb9 Merge branch 'NetHack-3.6' 2019-11-21 23:50:01 -05:00
nhmall 3545374e9c internal self-recover fix and bones name buffers 2019-11-21 23:41:11 -05:00
nhmall 4a8b9ee26c merge fix 2019-11-18 19:21:50 -05:00
nhmall 47fb8e5c0e Merge branch 'NetHack-3.6' 2019-11-18 19:20:55 -05:00
nhmall 893fa4efa8 update nhusage output on Windows 2019-11-18 19:20:03 -05:00
nhmall f7cb969e2d Merge branch 'NetHack-3.6' 2019-11-18 19:19:12 -05:00
nhmall 22180fc523 typo in fixes36.3 2019-11-18 16:58:43 -05:00
nhmall a763b99afd catch up on some post-beta1 corrections 2019-11-18 16:56:52 -05:00
nhmall ea17a00310 add some additional pluralization tests, order alphabetically to ease adds 2019-11-18 15:37:27 -05:00
nhmall d132093595 Merge branch 'NetHack-3.6' 2019-11-18 15:15:37 -05:00
nhmall 41299d44ae Merge branch 'k-sound' into NetHack-3.6 2019-11-18 15:14:55 -05:00
nhmall fbd10e4b0e some further refinements to --showpaths
The Windows data file path has to be constructed because
Windows defines VERSION_IN_DLB_FILENAME.

Keep the personal configuration file details as the last
information displayed.
2019-11-18 15:12:38 -05:00
nhmall 450957bfe9 further refine k-sound pluralization 2019-11-18 13:23:13 -05:00
nhmall a11a6b3204 Merge branch 'NetHack-3.6' 2019-11-18 10:34:55 -05:00
nhmall 732680dede Merge branch 'NetHack-3.6' 2019-11-17 21:40:34 -05:00
nhmall bb2185203f Merge branch 'NetHack-3.6' 2019-11-17 20:31:56 -05:00
nhmall a045763f56 date bump 2019-11-17 20:19:41 -05:00
nhmall e85646816c mark source tree as beta, previously marked work-in-progress 2019-11-17 20:06:21 -05:00
nhmall f4cbd4e538 Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-17 19:57:18 -05:00
nhmall f75939e27e re-enable ifdef'd out code during code sleuthing a while back 2019-11-17 19:55:50 -05:00
nhmall 689775024c Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-17 19:15:02 -05:00
nhmall 57584a22d7 add some guard code to the Is_*_level macros in dungeon.h
All Is_*_level tests during early startup would test as true until
dungeon_topology was initialized in a new game or restored from
a save file. That could result in some unexpected code paths being
taken.
2019-11-17 19:13:23 -05:00
nhmall 856b4db789 Merge branch 'NetHack-3.6' 2019-11-17 14:39:58 -05:00
nhmall cc5ecbcb56 Merge NetHack-3.6 2019-11-17 00:19:33 -05:00
nhmall 80b90f2b0f Merge branch 'NetHack-3.6' 2019-11-17 00:18:24 -05:00
nhmall 21e4595127 sysconf template for windows 2019-11-17 00:16:02 -05:00
nhmall 5f3398347c Merge branch 'NetHack-3.6' 2019-11-16 23:14:34 -05:00
nhmall 88127e2b8c Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-16 22:53:53 -05:00
nhmall a364348098 add an mgflags parameter to mapglyph() to alter how it behaves internally
avoid a recent save-value,call,restore-value kludge by adding
an mgflags parameter to mapglyph() to control its behavior

 Changes to be committed:
	modified:   doc/window.doc
	modified:   include/extern.h
	modified:   include/hack.h
	modified:   src/detect.c
	modified:   src/mapglyph.c
	modified:   src/pager.c
	modified:   sys/amiga/winfuncs.c
	modified:   sys/wince/mhmap.c
	modified:   win/Qt/qt_win.cpp
	modified:   win/Qt4/qt4map.cpp
	modified:   win/X11/winmap.c
	modified:   win/curses/cursdial.c
	modified:   win/curses/cursinvt.c
	modified:   win/curses/cursmain.c
	modified:   win/gem/wingem.c
	modified:   win/tty/wintty.c
	modified:   win/win32/mhmap.c
	modified:   win/win32/mswproc.c
2019-11-16 22:49:36 -05:00
nhmall 18f6af1466 Merge branch 'NetHack-3.6' 2019-11-16 18:27:50 -05:00
nhmall 0bc2cd281c bad merge fix 2019-11-16 17:33:37 -05:00
nhmall 6aef1f13a1 Merge branch 'NetHack-3.6' 2019-11-16 17:09:44 -05:00
nhmall db52f15101 Merge branch 'NetHack-3.6' 2019-11-16 17:01:49 -05:00
nhmall 21a1dcd86c Merge branch 'NetHack-3.6' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6 2019-11-16 16:40:40 -05:00
nhmall d74718fc2b likely final pluralization change for today 2019-11-16 14:17:11 -05:00
nhmall 5b7940ecb5 Merge branch 'NetHack-3.6' 2019-11-16 10:22:52 -05:00
nhmall cdbad827fe reinstate bit - gak! 2019-11-16 10:15:55 -05:00
nhmall 340851ecf5 Revert "more pluralization"
This reverts commit 6a3dcc6a38.
2019-11-16 10:13:49 -05:00
nhmall 6a3dcc6a38 more pluralization 2019-11-16 10:08:21 -05:00
nhmall 8b1c6148f6 improve pluralization on some words ending with a k-sound
fixes #245
2019-11-16 08:27:07 -05:00
nhmall e6b309fbc3 Merge branch 'NetHack-3.6' 2019-11-15 23:06:16 -05:00
nhmall bfb278fd38 Merge branch 'NetHack-3.7' 2019-11-15 22:23:55 -05:00
nhmall 29d378116e fix unplanned perm change 2019-11-15 22:22:19 -05:00
nhmall 4e05c874bf Merge branch 'NetHack-3.7' 2019-11-15 22:13:00 -05:00
nhmall b0d8e86c8c Merge branch 'NetHack-3.6' 2019-11-15 22:12:12 -05:00
nhmall 298af2294f quiet some macosx warnings 2019-11-15 21:20:38 -05:00
nhmall f319a8ce3f Merge branch 'master' into NetHack-3.7 2019-11-15 13:24:31 -05:00
nhmall f3cb37e7ca Merge branch 'NetHack-3.6' 2019-11-15 13:23:58 -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
nhmall b7d16efd76 Makefile.msc updates post-Lua integration 2019-11-15 09:51:04 -05:00
nhmall 78b0e5c804 Merge branch 'NetHack-3.7' into paxed-lua-v2-merged 2019-11-14 19:54:51 -05:00
nhmall 475a429459 Merge branch 'NetHack-3.6' 2019-11-14 19:52:33 -05:00