- Modified FLAC/share/alloc.h to define SIZE_T_MAX if it isn't defined

already. For some reason, a stock install of MinGW doesn't define it, but if you compile your own GCC, it installs headers that do. - Changed the way that the makefiles detect MSYS to a method that should be more foolproof, thanks to changes in MSYS. SVN r737 (trunk)
2024-11-23 20:42:24 +00:00 · 2008-02-10 01:21:45 +00:00 · 2008-02-10 01:21:45 +00:00 · 95180e18e6
commit 95180e18e6
parent 0f3a1cc8b1
18 changed files with 97 additions and 72 deletions
--- a/FLAC/Makefile.mgw
+++ b/FLAC/Makefile.mgw
@ -11,7 +11,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/FLAC/share/alloc.h
+++ b/FLAC/share/alloc.h
@ -33,14 +33,16 @@
 #endif
 #include <stdlib.h> /* for size_t, malloc(), etc */

-#ifndef SIZE_MAX
-# ifndef SIZE_T_MAX
-#  ifdef _MSC_VER
-#   define SIZE_T_MAX UINT_MAX
-#  else
-#   error
-#  endif
+#ifndef SIZE_T_MAX
+# ifdef _WIN64
+#  define SIZE_T_MAX ULLONG_MAX
+# elif defined(_WIN32)
+#  define SIZE_T_MAX UINT_MAX /* Why doesn't the standard MinGW distribution define this? */
+# else
+#  error
 # endif
+#endif
+#ifndef SIZE_MAX
 # define SIZE_MAX SIZE_T_MAX
 #endif

--- a/2
+++ b/2
@ -1,7 +1,7 @@
 ifeq (Windows_NT,$(OS))
  WIN=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
 endif

--- a/Makefile.mgw
+++ b/Makefile.mgw
@ -45,7 +45,7 @@ clean:
 	@$(MAKE) -C zlib -f Makefile.mgw clean
 	@$(MAKE) -C flac -f Makefile.mgw clean
 	@$(MAKE) -C jpeg-6b -f Makefile.mgw clean
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 	rm -f ccdv.exe
 else
 	del /q /f ccdv.exe 2>nul
--- a/Makefile.mingw
+++ b/Makefile.mingw
@ -1,10 +1,13 @@
+# This makefile makes zdoom(d).exe only.
+# Makefile.mgw builds this plus everything else.
+
 # Sub-makefile autogenerated by premake
 # And then tweaked by hand

 # Where did you install the FMOD API to? Change this line so that the build process can find it.
 FMODDIR = "c:/program files/fmodapi375win"

-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WINCMD=0
 else
  WINCMD=1
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@ -1,12 +1,23 @@
+February 9, 2008
+- Modified FLAC/share/alloc.h to define SIZE_T_MAX if it isn't defined
+  already. For some reason, a stock install of MinGW doesn't define it, but
+  if you compile your own GCC, it installs headers that do.
+- After thoroughly messing up my MinGW/MSYS installation, I deleted the whole
+  thing and reinstalled everything using the latest zips. Much to my surprise,
+  the MSYS-detection in the makefiles no longer worked because OSTYPE wasn't
+  being exported to process launched by the MSYS shell. I've now switched to a
+  different method I found through the power of Google that asks the shell
+  what version it is to see if the version string contains "msys".
+
 February 8, 2008
 - Applied Blzut3's sbarinfo update #11:
  * SBarInfo will also accept a '|' between flags for those who are really
    bothered by the indefinite "arguments" in the middle of the statement.
-  * Added: completeBorder.  When set to true SBarInfo will draw the border where
+  * Added: completeBorder. When set to true SBarInfo will draw the border where
    the status bar normally goes.
  * Fixed: I forgot to accept TK_None on "base" and "statusbar".
  * Fixed: "base" was apparently broken when the SBarInfo init code was moved to
-    d_main.cpp.  Also, if "base Strife" was used then it would not use the
+    d_main.cpp. Also, if "base Strife" was used then it would not use the
    default log message of "find help".
 - Fixed: D_ReadUserInfoString() parsed the final element of a compact string
  as the empty string. Since that was the player class, this meant that any
--- a/jpeg-6b/Makefile.mgw
+++ b/jpeg-6b/Makefile.mgw
@ -33,7 +33,7 @@ $(STATICLIB): $(OBJS)
 .PHONY: clean

 clean:
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 	rm -f $(STATICLIB)
 	rm -f *.o
 else
--- a/tools/dehsupp/Makefile
+++ b/tools/dehsupp/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/fixrtext/Makefile
+++ b/tools/fixrtext/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/lemon/Makefile
+++ b/tools/lemon/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/makewad/Makefile
+++ b/tools/makewad/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/makewad/makewad.c
+++ b/tools/makewad/makewad.c
@ -323,7 +323,7 @@ int buildwad (FILE *listfile, char *listfilename, const char *makecmd, char *mak
 				{
 					fprintf (wadfile, " \\\n\t\"%s\"", filename);
 				}
-				// ARGH! Stupid make. Too bad but then these files can't be checked. 
+				// ARGH! Stupid make. Too bad, but then these files can't be checked. 
 				// Still better than something that doesn't work at all though!
 				else if (!strpbrk(filename, "[]^"))	
 				{
--- a/tools/re2c/Makefile
+++ b/tools/re2c/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/updaterevision/Makefile
+++ b/tools/updaterevision/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/tools/updaterevision/trustinfo.rc
+++ b/tools/updaterevision/trustinfo.rc
@ -0,0 +1,6 @@
+// This resource script is for compiling with MinGW only. Visual C++
+// compilations use the manifest tool to insert the manifest instead.
+
+#include <WinUser.h>
+
+1 RT_MANIFEST "trustinfo.txt"
--- a/tools/xlatcc/Makefile
+++ b/tools/xlatcc/Makefile
@ -2,7 +2,7 @@ ifeq (Windows_NT,$(OS))
  WIN=1
  WINCMD=1
 endif
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
  WIN=1
  WINCMD=0
 endif
--- a/wadsrc/Makefile.mgw
+++ b/wadsrc/Makefile.mgw
@ -5,12 +5,15 @@ DEHSUPP=../tools/dehsupp/dehsupp
 ifneq ($(MAKECMDGOALS),clean)
 include Makefile2
 endif
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+export OSTYPE=msys
+endif

 wadmake: zdoom.lst $(MAKEWAD).exe $(XLATCC).exe $(DEHSUPP).exe
 	$(MAKEWAD) -make wadmake zdoom.lst

 clean:
-ifeq (msys,$(OSTYPE))
+ifeq ($(OSTYPE),msys)
 	rm -f wadmake zdoom.pk3 xlat/*.x dehsupp.lmp
 else
 	del /q /f wadmake zdoom.pk3 xlat\*.x dehsupp.lmp 2>nul
--- a/zlib/Makefile.mgw
+++ b/zlib/Makefile.mgw
@ -63,7 +63,7 @@ minigzip: minigzip.o $(STATICLIB)
 .PHONY: clean

 clean:
-ifeq (msys,$(OSTYPE))
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 	rm -f $(STATICLIB)
 	rm -f *.o
 	rm -f *.exe