* win32/exconfig.* : Files for Win32 Innosetup Helper DLL

	* win32/exult_installer.iss : Innosetup Installer Script
	* msvcstuff/* : Updated Projects
	* singles.h : Fixing a compiling problem
	* exulticon.h : Getting rid of warning
	* Makefile.common : Added win32 dir to search path
	* Makefile.mingw : Added rules for helper dll, and auto generate win32
	  installer

Author: wench

Makefile.common

@@ -1,6 +1,7 @@
 VPATH=$(SRC):$(SRC)/audio:$(SRC)/audio/midi_drivers:$(SRC)/conf:$(SRC)/data:$(SRC)/files:$(SRC)/files/zip:$(SRC)/flic: \
-$(SRC)/gumps:$(SRC)/imagewin:$(SRC)/mapedit/tools/mockup:$(SRC)/mapedit/tools/smooth:$(SRC)/objs:$(SRC)/pathfinder \
-$(SRC)/shapes:$(SRC)/server:$(SRC)/tools:$(SRC)/usecode:$(SRC)/usecode/compiler:$(SRC)/usecode/ucxt:$(SRC)/usecode/ucxt/src
+$(SRC)/gumps:$(SRC)/imagewin:$(SRC)/mapedit/tools/mockup:$(SRC)/mapedit/tools/smooth:$(SRC)/objs:$(SRC)/pathfinder: \
+$(SRC)/shapes:$(SRC)/server:$(SRC)/tools:$(SRC)/usecode:$(SRC)/usecode/compiler:$(SRC)/usecode/ucxt:$(SRC)/usecode/ucxt/src: \
+$(SRC)/win32
 
 VERSION=1.4.01cvs
 

Makefile.mingw

@@ -54,6 +54,13 @@ include Makefile.common
 exultico.o: win32/exultico.rc win32/exult.ico
 	windres --include-dir win32 win32/exultico.rc exultico.o
 
+exconfig_rc.o: win32/exconfig.rc
+	windres --include-dir win32 win32/exconfig.rc exconfig_rc.o
+
+exconfig.dll: win32/exconfig.def $(FILE_OBJS) $(CONF_OBJS) exconfig_rc.o exconfig.o
+	dllwrap --def win32/exconfig.def -o $@ $(FILE_OBJS) $(CONF_OBJS) exconfig_rc.o exconfig.o -lstdc++
+
+
 install: $(EXEC)
 	mkdir -p $(U7PATH)
 	strip $(EXEC) -o $(U7PATH)/$(EXEC)
@@ -66,7 +73,7 @@ install: $(EXEC)
 	cp SDL/lib/SDL_mixer.dll $(U7PATH)
 
 
-dist:   $(EXEC)
+dist:   $(EXEC) exconfig.dll
 	mkdir -p $(U7PATH)
 	mkdir -p $(U7PATH)/Exult
 	strip $(EXEC) -o $(U7PATH)/Exult/$(EXEC)
@@ -95,6 +102,9 @@ dist:   $(EXEC)
 	cp SDL/lib/SDL.dll $(U7PATH)/Exult
 	cp SDL/lib/SDL_mixer.dll $(U7PATH)/Exult
 	u2d $(U7PATH)/Exult/*.txt
+	strip exconfig.dll -o $(U7PATH)/exconfig.dll
+	cp win32/exult_installer.iss $(U7PATH)
+	iscc $(U7PATH)/exult_installer.iss
 
 toolsinstall: tools
 	mkdir -p $(U7PATH)

exulticon.h

@@ -35,6 +35,7 @@ class Game_singletons
 	static class Palette *pal;
 	static class Gump_manager *gumpman;
 	static class Party_manager *partyman;
+	friend class Game_window;
 public:
 	static void init(Game_window *g);
 	};

singles.h

@@ -1,5 +1,5 @@
 EXPORTS
-	GetExultGamePaths = GetExultGamePaths@16
-	SetExultGamePaths = SetExultGamePaths@12
-	VerifyBGDirectory = VerifyBGDirectory@4
-	VerifySIDirectory = VerifySIDirectory@4
+	GetExultGamePaths
+	SetExultGamePaths
+	VerifyBGDirectory
+	VerifySIDirectory

win32/exconfig.def

@@ -248,13 +248,19 @@ function NextButtonClick(CurPageID: Integer): Boolean;
 var
   iBGVerified: Integer;
   iSIVerified: Integer;
+  sDir : string;
 begin
 
   if CurPageID = DataDirPage.ID then begin
 
-      iBGVerified := VerifyBGDirectory ( BGEdit.Text );
-      iSIVerified := VerifySIDirectory ( SIEdit.Text );
-      
+      sDir := BGEdit.Text;
+      if Length(sDir) > 0 then begin iBGVerified := VerifyBGDirectory ( sDir );
+      end else iBGVerified := 0;
+
+      sDir := SIEdit.Text;
+      if Length(sDir) > 0 then begin iSIVerified := VerifySIDirectory ( sDir );
+      end else iSIVerified := 0;
+
       if (iBGVerified = 0) AND (iSIVerified = 0) then begin
         if MsgBox ('Warning: No valid game installations found. Do you wish to continue?', mbError, MB_YESNO or MB_DEFBUTTON2) = IDYES then begin
           Result := True;