* Rename winmain.h to main.h since all it's forward declarations refer to main.c and having nothing whatsoever to do with MSWin

* Remove forward declaration of "BOOL frontendInitialised" since it is nowhere defined

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2469 4a71c877-e1ca-e34f-864e-861f7616d084

src/Makefile.am

@@ -28,7 +28,7 @@ noinst_HEADERS = action.h advvis.h ai.h aiexperience.h anim_id.h \
 	researchdef.h resource.h scores.h scriptai.h scriptcb.h scriptextern.h scriptfuncs.h \
 	scriptobj.h scripttabs.h scriptvals.h selection.h seqdisp.h stats.h statsdef.h \
 	structure.h structuredef.h target.h text.h texture.h transporter.h visibility.h \
-	warcam.h warzoneconfig.h weapondef.h winmain.h wrappers.h
+	warcam.h warzoneconfig.h weapondef.h main.h wrappers.h
 
 warzone2100_SOURCES = scriptvals_parser.tab.c scriptvals_lexer.lex.c \
 	level_lexer.lex.c ai.c aiexperience.c astar.c action.c advvis.c atmos.c bridge.c \

src/clparse.c

@@ -31,7 +31,7 @@
 #include "lib/framework/frame.h"
 #include "lib/widget/widget.h"
 
-#include "winmain.h"
+#include "main.h"
 #include "frontend.h"
 
 #include "lib/ivis_common/pieclip.h"

src/design.c

@@ -70,7 +70,7 @@
 #include "component.h"
 #include "lib/script/script.h"
 #include "scripttabs.h"
-#include "winmain.h"
+#include "main.h"
 #include "objects.h"
 #include "display.h"
 #include "console.h"

src/frontend.c

@@ -58,7 +58,7 @@
 #include "seqdisp.h"
 #include "text.h"
 #include "warzoneconfig.h"
-#include "winmain.h"
+#include "main.h"
 #include "wrappers.h"
 
 static int StartWithGame = 1; // New game starts in Cam 1.

src/hci.c

@@ -66,7 +66,7 @@
 #include "text.h"
 #include "transporter.h"
 #include "warcam.h"
-#include "winmain.h"
+#include "main.h"
 #include "wrappers.h"
 
 

src/ingameop.c

@@ -50,7 +50,7 @@
 #include "ingameop.h"
 #include "mission.h"
 #include "transporter.h"
-#include "winmain.h"
+#include "main.h"
 
 extern void addText(int FontID,UDWORD FormID,UDWORD id,  UDWORD PosX, UDWORD PosY, char *txt, UDWORD attachID,BOOL *State);
 

src/init.c

@@ -88,7 +88,7 @@
 #include "texture.h"
 #include "transporter.h"
 #include "warzoneconfig.h"
-#include "winmain.h"
+#include "main.h"
 #include "wrappers.h"
 
 #ifdef ARROWS

src/intimage.c

@@ -62,7 +62,7 @@
 #include "lib/widget/slider.h"
 #include "lib/framework/fractions.h"
 #include "order.h"
-#include "winmain.h"
+#include "main.h"
 
 #include "intimage.h"
 

src/loadsave.c

@@ -40,7 +40,7 @@
 #include "lib/sound/audio_id.h"
 #include "lib/sound/audio.h"
 #include "frontend.h"
-#include "winmain.h"
+#include "main.h"
 #include "display3d.h"
 #include "display.h"
 #ifndef WIN32

src/main.c

@@ -64,7 +64,7 @@
 #include "research.h"
 #include "seqdisp.h"
 #include "warzoneconfig.h"
-#include "winmain.h"
+#include "main.h"
 #include "wrappers.h"
 
 #ifndef DATADIR

src/main.h

@@ -30,7 +30,6 @@ typedef enum {
 
 //flag to indicate when initialisation is complete
 extern BOOL gameInitialised;
-extern BOOL frontendInitialised;
 extern BOOL bDisableLobby;
 
 extern GS_GAMEMODE GetGameMode(void) WZ_DECL_PURE;

src/mission.c

@@ -49,7 +49,7 @@
 #include "text.h"
 #include "frontend.h"		// for displaytextoption.
 #include "intdisplay.h"
-#include "winmain.h"
+#include "main.h"
 #include "display.h"
 #include "loadsave.h"
 #include "lib/script/script.h"

src/multiint.c

@@ -35,7 +35,7 @@
 #include "lib/ivis_opengl/screen.h"
 #include "lib/widget/widget.h"
 
-#include "winmain.h"
+#include "main.h"
 #include "objects.h"
 #include "display.h"// pal stuff
 #include "display3d.h"

src/multiopt.c

@@ -28,7 +28,7 @@
 #include "map.h"
 #include "game.h"			// for loading maps
 #include "message.h"		// for clearing messages.
-#include "winmain.h"
+#include "main.h"
 #include "display3d.h"		// for changing the viewpoint
 #include "power.h"
 #include "lib/widget/widget.h"

src/scriptextern.c

@@ -35,7 +35,7 @@
 
 #include "multiplay.h"
 
-#include "winmain.h"
+#include "main.h"
 #include "hci.h"
 #include "lib/gamelib/gtime.h"
 

src/stats.c

@@ -32,7 +32,7 @@
 #include "objects.h"
 #include "stats.h"
 #include "map.h"
-#include "winmain.h"
+#include "main.h"
 #include "lib/sound/audio_id.h"
 #include "projectile.h"
 #include "text.h"

src/wrappers.c

@@ -45,7 +45,7 @@
 #include "hci.h"		// access to widget screen.
 #include "lib/widget/widget.h"
 #include "wrappers.h"
-#include "winmain.h"
+#include "main.h"
 #include "objects.h"
 #include "display.h"
 #include "display3d.h"

warzone2100.cbp

@@ -650,6 +650,7 @@
 		<Unit filename="src/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/main.h" />
 		<Unit filename="src/map.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -868,7 +869,6 @@
 		</Unit>
 		<Unit filename="src/warzoneconfig.h" />
 		<Unit filename="src/weapondef.h" />
-		<Unit filename="src/winmain.h" />
 		<Unit filename="src/wrappers.c">
 			<Option compilerVar="CC" />
 		</Unit>