more updates

Rules.make.in

@@ -42,11 +42,11 @@ DISTLIST=$(TOPDIR)/distlist
 TAGS=$(TOPDIR)/src/tags
 
 # Linux
-EXE=
-OUTFILE=$(TOPDIR)/freecraft
-ARCH=linux
-OE=o
-OBJDIR=obj
+EXE=@EXE@
+OUTFILE=@OUTFILE@
+ARCH=@ARCH@
+OE=@OE@
+OBJDIR=@OBJDIR@
 
 IFLAGS=	-I$(TOPDIR)/src/include $(XIFLAGS) -I$(TOPDIR)/src/movie/vp31/include
 
@@ -54,7 +54,7 @@ CFLAGS=@PROFILE_CFLAGS@ @DEBUG_CFLAGS@ $(IFLAGS) \
     -DUNIT_ON_MAP -DNEW_AI -DUSE_LIBMODPLUG -DUSE_HP_FOR_XP \
     @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \
     @OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ \
-    $(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ $(ARTSC)
+    $(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ @PLATFORM@ $(ARTSC)
 
 CTAGSFLAGS=-i defptvS -a -f 
 

configure.in

@@ -3,7 +3,24 @@ AC_INIT(configure.in)
 AC_PREREQ([2.50])
 dnl AC_CANONICAL_TARGET
 
-echo `uname -a`
+if test "`uname -a` | grep -is cygwin" -o "`uname -a` | grep -is mingw"; then
+    EXE=.exe
+    OUTFILE="\$(TOPDIR)/freecraft\$(EXE)"
+    ARCH=win32
+    OE=o
+    OBJDIR=winobj
+else
+    EXE=
+    OUTFILE="\$(TOPDIR)/freecraft\$(EXE)"
+    ARCH=linux
+    OE=o
+    OBJDIR=obj
+fi
+AC_SUBST(EXE)
+AC_SUBST(OUTFILE)
+AC_SUBST(ARCH)
+AC_SUBST(OE)
+AC_SUBST(OBJDIR)
 
 AC_CHECK_HEADERS(zlib.h,, AC_MSG_ERROR(could not find zlib.h))
 AC_CHECK_HEADERS(png.h,, AC_MSG_ERROR(could not find png.h))