relocate some gem and Gnome files to outdated folder tree

diff --git a/include/bitmfile.h b/outdated/include/bitmfile.h
similarity index 100%
rename from include/bitmfile.h
rename to outdated/include/bitmfile.h

diff --git a/include/gem_rsc.h b/outdated/include/gem_rsc.h
similarity index 100%
rename from include/gem_rsc.h
rename to outdated/include/gem_rsc.h

diff --git a/include/load_img.h b/outdated/include/load_img.h
similarity index 100%
rename from include/load_img.h
rename to outdated/include/load_img.h

diff --git a/include/winGnome.h b/outdated/include/winGnome.h
similarity index 100%
rename from include/winGnome.h
rename to outdated/include/winGnome.h

diff --git a/include/wingem.h b/outdated/include/wingem.h
similarity index 100%
rename from include/wingem.h
rename to outdated/include/wingem.h

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index 946a11770efb71c1865fd957b1e86221ddc39303..d37dfdce8c91fbc7658ceee00f90ceb6acd5f9ff 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -1146,58 +1146,6 @@ $(O)wintext.o: ../win/X11/wintext.c $(HACK_H) $(INCL)/winX.h $(INCL)/xwindow.h
 $(O)winval.o: ../win/X11/winval.c $(HACK_H) $(INCL)/winX.h
        $(CC) $(cflags) -o$@ ../win/X11/winval.c
 $(O)tile.o: tile.c $(HACK_H)
-$(O)gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \
-               ../win/gnome/gnmain.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnaskstr.c
-$(O)gnbind.o: ../win/gnome/gnbind.c ../win/gnome/gnbind.h ../win/gnome/gnmain.h \
-               ../win/gnome/gnaskstr.h ../win/gnome/gnyesno.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnbind.c
-$(O)gnglyph.o: ../win/gnome/gnglyph.c ../win/gnome/gnglyph.h $(INCL)/tile2x11.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnglyph.c
-$(O)gnmain.o: ../win/gnome/gnmain.c ../win/gnome/gnmain.h ../win/gnome/gnsignal.h \
-               ../win/gnome/gnbind.h ../win/gnome/gnopts.h $(HACK_H) \
-               $(INCL)/date.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmain.c
-$(O)gnmap.o: ../win/gnome/gnmap.c ../win/gnome/gnmap.h ../win/gnome/gnglyph.h \
-               ../win/gnome/gnsignal.h $(HACK_H)
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmap.c
-$(O)gnmenu.o: ../win/gnome/gnmenu.c ../win/gnome/gnmenu.h ../win/gnome/gnmain.h \
-               ../win/gnome/gnbind.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmenu.c
-$(O)gnmesg.o: ../win/gnome/gnmesg.c ../win/gnome/gnmesg.h ../win/gnome/gnsignal.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnmesg.c
-$(O)gnopts.o: ../win/gnome/gnopts.c ../win/gnome/gnopts.h ../win/gnome/gnglyph.h \
-               ../win/gnome/gnmain.h ../win/gnome/gnmap.h $(HACK_H)
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnopts.c
-$(O)gnplayer.o: ../win/gnome/gnplayer.c ../win/gnome/gnplayer.h \
-               ../win/gnome/gnmain.h $(HACK_H)
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnplayer.c
-$(O)gnsignal.o: ../win/gnome/gnsignal.c ../win/gnome/gnsignal.h \
-               ../win/gnome/gnmain.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnsignal.c
-$(O)gnstatus.o: ../win/gnome/gnstatus.c ../win/gnome/gnstatus.h \
-               ../win/gnome/gnsignal.h ../win/gnome/gn_xpms.h \
-               ../win/gnome/gnomeprv.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnstatus.c
-$(O)gntext.o: ../win/gnome/gntext.c ../win/gnome/gntext.h ../win/gnome/gnmain.h \
-               ../win/gnome/gn_rip.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gntext.c
-$(O)gnworn.o: ../win/gnome/gnworn.c ../win/gnome/gnworn.h ../win/gnome/gnglyph.h \
-               ../win/gnome/gnsignal.h ../win/gnome/gnomeprv.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnworn.c
-$(O)gnyesno.o: ../win/gnome/gnyesno.c ../win/gnome/gnbind.h ../win/gnome/gnyesno.h
-       $(CC) $(cflags) $(GNOMEINC) -o$@ ../win/gnome/gnyesno.c
-$(O)wingem.o: ../win/gem/wingem.c $(HACK_H) $(INCL)/func_tab.h $(INCL)/dlb.h \
-               $(INCL)/wingem.h
-       $(CC) $(cflags) -o$@ ../win/gem/wingem.c
-$(O)wingem1.o: ../win/gem/wingem1.c $(INCL)/gem_rsc.h $(INCL)/load_img.h \
-               $(INCL)/gr_rect.h $(INCL)/wintype.h $(INCL)/wingem.h
-       $(CC) $(cflags) -o$@ ../win/gem/wingem1.c
-$(O)load_img.o: ../win/gem/load_img.c $(INCL)/load_img.h
-       $(CC) $(cflags) -o$@ ../win/gem/load_img.c
-$(O)gr_rect.o: ../win/gem/gr_rect.c $(INCL)/gr_rect.h
-       $(CC) $(cflags) -o$@ ../win/gem/gr_rect.c
-$(O)tile.o: tile.c $(HACK_H)
 $(O)qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) $(INCL)/func_tab.h \
                $(INCL)/dlb.h $(INCL)/tile2x11.h \
                $(INCL)/qt_win.h $(INCL)/qt_clust.h $(INCL)/qt_kde0.h \
@@ -1317,7 +1265,7 @@ $(O)vision.o: vision.c $(HACK_H)
 $(O)weapon.o: weapon.c $(HACK_H)
 $(O)were.o: were.c $(HACK_H)
 $(O)wield.o: wield.c $(HACK_H)
-$(O)windows.o: windows.c $(HACK_H) $(INCL)/wingem.h $(INCL)/winGnome.h
+$(O)windows.o: windows.c $(HACK_H)
 $(O)wizard.o: wizard.c $(HACK_H)
 $(O)worm.o: worm.c $(HACK_H)
 $(O)worn.o: worn.c $(HACK_H)

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 50e13de1c5db6f2813f2ce4ce6c264ca0195a02d..cf061346728e471300f8aa693f95816e9c496cb9 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -167,13 +167,6 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $(TARGETPFX)unixtty.o \
 # X11CFLAGS=-I/opt/X11/include to find <X11/foo.h> in /opt/X11/include/X11/foo.h
 #X11CFLAGS=
 
-# Only used for the Gnome interface.
-# When including the Gnome interface, you need to include gnome specific
-# directories.  The ones given below is the usual spot for linux systems.
-# The paths are for glibconfig.h and gnomesupport.h respectively.
-#
-#GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
-
 # flags for debugging:
 # CFLAGS = -g -I../include
 
@@ -272,33 +265,6 @@ WINQTOBJ = $(TARGETPFX)qt_bind.o $(TARGETPFX)qt_click.o \
        $(TARGETPFX)qt_set.o $(TARGETPFX)qt_stat.o $(TARGETPFX)qt_str.o \
        $(TARGETPFX)qt_streq.o $(TARGETPFX)qt_svsel.o $(TARGETPFX)qt_win.o \
        $(TARGETPFX)qt_xcmd.o $(TARGETPFX)qt_yndlg.o $(TARGETPFX)tile.o
-#
-# Files for a Gnome port
-#
-#WINGNOMESRC = ../win/gnome/gnaskstr.c ../win/gnome/gnbind.c \
-#      ../win/gnome/gnglyph.c ../win/gnome/gnmain.c ../win/gnome/gnmap.c \
-#      ../win/gnome/gnmenu.c ../win/gnome/gnmesg.c ../win/gnome/gnopts.c \
-#      ../win/gnome/gnplayer.c ../win/gnome/gnsignal.c \
-#      ../win/gnome/gnstatus.c ../win/gnome/gntext.c ../win/gnome/gnyesno.c \
-#      ../win/gnome/gnworn.c
-#WINGNOMEOBJ = $(TARGETPFX)gnaskstr.o $(TARGETPFX)gnbind.o $(TARGETPFX)gnglyph.o \
-#      $(TARGETPFX)gnmain.o $(TARGETPFX)gnmap.o $(TARGETPFX)gnmenu.o \
-#      $(TARGETPFX)gnmesg.o $(TARGETPFX)gnopts.o $(TARGETPFX)gnplayer.o \
-#      $(TARGETPFX)gnsignal.o $(TARGETPFX)gnstatus.o $(TARGETPFX)gntext.o \
-#      $(TARGETPFX)gnyesno.o $(TARGETPFX)gnworn.o $(TARGETPFX)tile.o
-# empty values for 'make depend'
-WINGNOMESRC =
-WINGNOMEOBJ =
-
-#
-# Files for a Gem port
-#WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \
-#      ../win/gem/gr_rect.c tile.c
-#WINGEMOBJ = $(TARGETPFX)wingem.o $(TARGETPFX)wingem1.o \
-#      $(TARGETPFX)load_img.o $(TARGETPFX)gr_rect.o $(TARGETPFX)tile.o
-# empty values for 'make depend'
-WINGEMSRC =
-WINGEMOBJ =
 
 # Files for Shim windowing interface for libnh -- doesn't do anything,
 # just passes along the API calls to the library
@@ -360,12 +326,6 @@ WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
 # libraries for KDE (with Qt)
 WINKDELIB = -lkdecore -lkdeui -lXext
 #
-# libraries for Gnome
-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
-#
-# libraries for Gem port
-WINGEMLIB = -le_gem -lgem
-#
 # libraries for BeOS
 WINBELIB = -lbe
 #
@@ -537,7 +497,7 @@ SYSCXXSRC = ../sys/share/cppregex.cpp
 GENCSRC = #tile.c
 
 # all windowing-system-dependent .c (for dependencies and such)
-WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC) $(WINSHIMSRC)
+WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINSHIMSRC)
 # all windowing-system-dependent .cpp (for dependencies and such)
 WINCXXSRC = $(WINQTSRC) $(WINQT3SRC) $(WINBESRC)
 
@@ -1195,8 +1155,7 @@ $(TARGETPFX)vision.o: vision.c $(HACK_H)
 $(TARGETPFX)weapon.o: weapon.c $(HACK_H)
 $(TARGETPFX)were.o: were.c $(HACK_H)
 $(TARGETPFX)wield.o: wield.c $(HACK_H)
-$(TARGETPFX)windows.o: windows.c $(HACK_H) ../include/wintty.h \
-               ../include/wingem.h ../include/winGnome.h
+$(TARGETPFX)windows.o: windows.c $(HACK_H) ../include/wintty.h
 $(TARGETPFX)wizard.o: wizard.c $(HACK_H)
 $(TARGETPFX)worm.o: worm.c $(HACK_H)
 $(TARGETPFX)worn.o: worn.c $(HACK_H)

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index 0ee0edfa2c8b1a22cd50a56da0b71aac6c04c249..daaffb24106dd9db723fa1fb5e45dcc2b2bca0e2 100644 (file)
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -244,7 +244,6 @@
                3186A37A21A4B0FA0052BF02 /* integer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = integer.h; path = ../../include/integer.h; sourceTree = "<group>"; };
                3186A37B21A4B0FA0052BF02 /* region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = region.h; path = ../../include/region.h; sourceTree = "<group>"; };
                3186A37C21A4B0FA0052BF02 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rect.h; path = ../../include/rect.h; sourceTree = "<group>"; };
-               3186A37D21A4B0FA0052BF02 /* wingem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wingem.h; path = ../../include/wingem.h; sourceTree = "<group>"; };
                3186A37E21A4B0FA0052BF02 /* vision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vision.h; path = ../../include/vision.h; sourceTree = "<group>"; };
                3186A37F21A4B0FA0052BF02 /* prop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = prop.h; path = ../../include/prop.h; sourceTree = "<group>"; };
                3186A38121A4B0FB0052BF02 /* pcconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pcconf.h; path = ../../include/pcconf.h; sourceTree = "<group>"; };
@@ -303,7 +302,6 @@
                3186A3CB21A4B0FE0052BF02 /* sys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sys.h; path = ../../include/sys.h; sourceTree = "<group>"; };
                3186A3CC21A4B0FE0052BF02 /* gem_rsc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gem_rsc.h; path = ../../include/gem_rsc.h; sourceTree = "<group>"; };
                3186A3CD21A4B0FE0052BF02 /* trap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = trap.h; path = ../../include/trap.h; sourceTree = "<group>"; };
-               3186A3CE21A4B0FE0052BF02 /* winGnome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = winGnome.h; path = ../../include/winGnome.h; sourceTree = "<group>"; };
                3186A3D021A4B0FE0052BF02 /* decl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = decl.h; path = ../../include/decl.h; sourceTree = "<group>"; };
                3186A3D321A4B14B0052BF02 /* cursstat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cursstat.h; path = ../../win/curses/cursstat.h; sourceTree = "<group>"; };
                3186A3D421A4B14B0052BF02 /* cursdial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cursdial.h; path = ../../win/curses/cursdial.h; sourceTree = "<group>"; };
@@ -721,8 +719,6 @@
                                3186A3BE21A4B0FD0052BF02 /* vmsconf.h */,
                                3186A3AA21A4B0FD0052BF02 /* winami.h */,
                                3186A37621A4B0FA0052BF02 /* wincurs.h */,
-                               3186A37D21A4B0FA0052BF02 /* wingem.h */,
-                               3186A3CE21A4B0FE0052BF02 /* winGnome.h */,
                                3186A36F21A4B0FA0052BF02 /* winprocs.h */,
                                3186A39A21A4B0FD0052BF02 /* wintty.h */,
                                3186A3C021A4B0FD0052BF02 /* wintype.h */,