From 5800687491d64ec3d7175b89763603a33203e697 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 22 Jul 2006 06:13:16 +0000
Subject: [PATCH] The part of "Fixes from JonoF" that I forgot to commit

git-svn-id: https://svn.eduke32.com/eduke32@243 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile      |  5 +++--
 polymer/eduke32/Makefile.deps |  6 +++---
 polymer/eduke32/Makefile.msvc | 11 +++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 15a6c7b94..03818deda 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -100,6 +100,7 @@ GAMEOBJS=$(OBJ)game.$o \
 	$(OBJ)testcd.$o \
 	$(OBJ)osdfuncs.$o \
 	$(OBJ)osdcmds.$o \
+    $(OBJ)grpscan.$o \
 	$(JMACTOBJ)
 
 EDITOROBJS=$(OBJ)astub.$o
@@ -107,7 +108,7 @@ EDITOROBJS=$(OBJ)astub.$o
 ifeq ($(PLATFORM),WINDOWS)
 	OURCFLAGS+= -DUNDERSCORES -I$(DXROOT)/include
 	NASMFLAGS+= -DUNDERSCORES -f win32
-	GAMEOBJS+= $(OBJ)gameres.$o $(OBJ)winbits.$o $(OBJ)startwin.game.$o $(OBJ)startdlg.$o
+	GAMEOBJS+= $(OBJ)gameres.$o $(OBJ)winbits.$o $(OBJ)startwin.game.$o
 	EDITOROBJS+= $(OBJ)buildres.$o
 endif
 
@@ -122,7 +123,7 @@ ifeq ($(RENDERTYPE),SDL)
 
 	ifeq (1,$(HAVE_GTK2))
 		OURCFLAGS+= -DHAVE_GTK2 $(shell pkg-config --cflags gtk+-2.0)
-		GAMEOBJS+= $(OBJ)game_banner.$o $(OBJ)startgtk.game.$o $(OBJ)startdlg.$o
+		GAMEOBJS+= $(OBJ)game_banner.$o $(OBJ)startgtk.game.$o
 		EDITOROBJS+= $(OBJ)editor_banner.$o
 	endif
 
diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps
index f418cf433..f1d0c5dc7 100644
--- a/polymer/eduke32/Makefile.deps
+++ b/polymer/eduke32/Makefile.deps
@@ -1,7 +1,7 @@
 duke3d_h=$(EINC)build.h $(EINC)pragmas.h $(EINC)compat.h $(EINC)cache1d.h $(EINC)baselayer.h $(SRC)jmact/types.h $(SRC)jmact/file_lib.h $(SRC)jmact/util_lib.h $(SRC)jmact/keyboard.h $(SRC)jmact/control.h $(INC)develop.h $(INC)gamedefs.h $(INC)function.h $(INC)config.h $(INC)sounds.h $(INC)rts.h $(INC)_rts.h $(INC)soundefs.h $(SRC)jaudiolib/fx_man.h $(SRC)jaudiolib/music.h $(INC)namesdyn.h $(INC)funct.h $(INC)duke3d.h $(EINC)mmulti.h
 gamedef_h=$(SRC)gamedef.h
 
-$(OBJ)game.$o: $(SRC)*.c $(SRC)jmact/scriplib.h $(duke3d_h) $(INC)osdfuncs.h $(INC)osdcmds.h
+$(OBJ)game.$o: $(SRC)*.c $(SRC)jmact/scriplib.h $(duke3d_h) $(INC)osdfuncs.h $(INC)osdcmds.h $(INC)grpscan.h
 $(OBJ)actors.$o: $(SRC)actors.c $(duke3d_h)
 $(OBJ)anim.$o: $(SRC)anim.c $(duke3d_h) $(SRC)jmact/animlib.h
 $(OBJ)gamedef.$o: $(SRC)gamedef.c $(duke3d_h) $(gamedef_h)
@@ -27,10 +27,10 @@ $(OBJ)astub.$o: $(SRC)astub.c $(EINC)build.h $(EINC)pragmas.h $(EINC)compat.h $(
 $(OBJ)game_icon.$o: $(RSRC)game_icon.c
 $(OBJ)build_icon.$o: $(RSRC)build_icon.c
 
-$(OBJ)startdlg.$o: $(SRC)startdlg.c $(EINC)compat.h $(EINC)baselayer.h $(EINC)scriptfile.h $(EINC)cache1d.h $(EINC)crc32.h $(INC)startdlg.h
+$(OBJ)grpscan.$o: $(SRC)grpscan.c $(EINC)compat.h $(EINC)baselayer.h $(EINC)scriptfile.h $(EINC)cache1d.h $(EINC)crc32.h $(INC)grpscan.h
 $(OBJ)gameres.$o: $(SRC)misc/gameres.rc $(SRC)startwin.game.h $(RSRC)game.bmp $(RSRC)game_icon.ico
 $(OBJ)buildres.$o: $(SRC)misc/buildres.rc $(EINC)startwin.editor.h $(RSRC)build.bmp $(RSRC)build_icon.ico
-$(OBJ)startwin.game.$o: $(SRC)startwin.game.c $(duke3d_h) $(EINC)build.h $(EINC)winlayer.h $(EINC)compat.h $(INC)startdlg.h
+$(OBJ)startwin.game.$o: $(SRC)startwin.game.c $(duke3d_h) $(EINC)build.h $(EINC)winlayer.h $(EINC)compat.h $(INC)grpscan.h
 $(OBJ)startgtk.game.$o: $(SRC)startgtk.game.c $(duke3d_h) $(EINC)dynamicgtk.h $(EINC)build.h $(EINC)baselayer.h $(EINC)compat.h
 
 
diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc
index 00dc22d59..6f59a3169 100644
--- a/polymer/eduke32/Makefile.msvc
+++ b/polymer/eduke32/Makefile.msvc
@@ -83,10 +83,13 @@ AUDIOLIBOBJ=$(AUDIOLIB_JFAUD)
 	$(OBJ)animlib.$o\
 	$(OBJ)testcd.$o \
 	$(OBJ)osdfuncs.$o \
-	$(OBJ)osdcmds.$o \
-	$(JMACTOBJ) \
-	$(AUDIOLIBOBJ) \
-	$(OBJ)winbits.$o $(OBJ)gameres.res $(OBJ)startwin.game.$o $(OBJ)startdlg.$o
+ 	$(OBJ)osdcmds.$o \
+	$(OBJ)grpscan.$o \
+	$(OBJ)winbits.$o \
+	$(OBJ)gameres.res \
+	$(OBJ)startwin.game.$o \
+ 	$(JMACTOBJ) \
+	$(AUDIOLIBOBJ)
 
 EDITOROBJS=$(OBJ)astub.$o \
 	$(OBJ)buildres.res