Remove 31 makefiles

With /opt:nowin98, the regular ANSI version will run on Win32s. NT 3.51
has no problems with the 4.0 version either. Older NT versions have been
unsupported for some time already.

5 files changed, 3 insertions, 149 deletions

diff --git a/Makefile.vc6-ansi b/Makefile.vc6-ansi
index 69a1d11..fece0b8 100644
--- a/Makefile.vc6-ansi
+++ b/Makefile.vc6-ansi
@@ -2,7 +2,7 @@
 
 CXX     = cl.exe
 CFLAGS  = -O2 -GA -W3 -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo
-LDFLAGS = /link /entry:_entry kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib
+LDFLAGS = /link /entry:_entry /opt:nowin98 /fixed:no kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib
 
 out/widgetfactory.exe: out/widgetfactory.obj  out/alfbutton.obj out/alfcombobox.obj out/alfcompat.obj out/alf.obj out/alfdpiaware.obj out/alfedit.obj out/alflabel.obj out/alflayout.obj out/alfnotebook.obj out/alfpanel.obj out/alfwindow.obj
 	$(CXX) $(CFLAGS) -Fe$@ $** $(LDFLAGS)
diff --git a/Makefile.vc6-ansi-31 b/Makefile.vc6-ansi-31
deleted file mode 100644
index 3069c08..0000000
--- a/Makefile.vc6-ansi-31
+++ /dev/null
@@ -1,48 +0,0 @@
-# automatically created by makemakefile.sh. DO NOT EDIT!
-
-CXX     = cl.exe
-CFLAGS  = -O2 -GA -W3 -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo
-LDFLAGS = /link /subsystem:windows,3.10 /entry:_entry /fixed:no kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib
-
-out/widgetfactory.exe: out/widgetfactory.obj  out/alfbutton.obj out/alfcombobox.obj out/alfcompat.obj out/alf.obj out/alfdpiaware.obj out/alfedit.obj out/alflabel.obj out/alflayout.obj out/alfnotebook.obj out/alfpanel.obj out/alfwindow.obj
-	$(CXX) $(CFLAGS) -Fe$@ $** $(LDFLAGS)
-
-out/alfbutton.obj: alf/alfbutton.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfbutton.cpp
-
-out/alfcombobox.obj: alf/alfcombobox.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfcombobox.cpp
-
-out/alfcompat.obj: alf/alfcompat.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfcompat.cpp
-
-out/alf.obj: alf/alf.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alf.cpp
-
-out/alfdpiaware.obj: alf/alfdpiaware.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfdpiaware.cpp
-
-out/alfedit.obj: alf/alfedit.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfedit.cpp
-
-out/alflabel.obj: alf/alflabel.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alflabel.cpp
-
-out/alflayout.obj: alf/alflayout.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alflayout.cpp
-
-out/alfnotebook.obj: alf/alfnotebook.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfnotebook.cpp
-
-out/alfpanel.obj: alf/alfpanel.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfpanel.cpp
-
-out/alfwindow.obj: alf/alfwindow.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfwindow.cpp
-
-out/widgetfactory.obj: widgetfactory.cpp alf/alf.h
-	$(CXX) $(CFLAGS) -c -Fo$@ widgetfactory.cpp
-
-clean:
-	del /f out\*.obj out\*.exe
-
diff --git a/Makefile.vc6-nt31 b/Makefile.vc6-nt31
deleted file mode 100644
index 782ada0..0000000
--- a/Makefile.vc6-nt31
+++ /dev/null
@@ -1,48 +0,0 @@
-# automatically created by makemakefile.sh. DO NOT EDIT!
-
-CXX     = cl.exe
-CFLAGS  = -O2 -GA -W3 -DUNICODE -D_UNICODE -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo
-LDFLAGS = /link /subsystem:windows,3.10 /entry:_entry kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib
-
-out/widgetfactory.exe: out/widgetfactory.obj  out/alfbutton.obj out/alfcombobox.obj out/alfcompat.obj out/alf.obj out/alfdpiaware.obj out/alfedit.obj out/alflabel.obj out/alflayout.obj out/alfnotebook.obj out/alfpanel.obj out/alfwindow.obj
-	$(CXX) $(CFLAGS) -Fe$@ $** $(LDFLAGS)
-
-out/alfbutton.obj: alf/alfbutton.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfbutton.cpp
-
-out/alfcombobox.obj: alf/alfcombobox.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfcombobox.cpp
-
-out/alfcompat.obj: alf/alfcompat.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfcompat.cpp
-
-out/alf.obj: alf/alf.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alf.cpp
-
-out/alfdpiaware.obj: alf/alfdpiaware.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfdpiaware.cpp
-
-out/alfedit.obj: alf/alfedit.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfedit.cpp
-
-out/alflabel.obj: alf/alflabel.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alflabel.cpp
-
-out/alflayout.obj: alf/alflayout.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alflayout.cpp
-
-out/alfnotebook.obj: alf/alfnotebook.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfnotebook.cpp
-
-out/alfpanel.obj: alf/alfpanel.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfpanel.cpp
-
-out/alfwindow.obj: alf/alfwindow.cpp  alf/alfcompat.h alf/alf.h alf/alflayout.h alf/alflist.h alf/alfpriv.h
-	$(CXX) $(CFLAGS) -c -Fo$@ alf/alfwindow.cpp
-
-out/widgetfactory.obj: widgetfactory.cpp alf/alf.h
-	$(CXX) $(CFLAGS) -c -Fo$@ widgetfactory.cpp
-
-clean:
-	del /f out\*.obj out\*.exe
-
diff --git a/makemakefile.sh b/makemakefile.sh
index e968990..9e28c2b 100755
--- a/makemakefile.sh
+++ b/makemakefile.sh
@@ -75,38 +75,13 @@ ALF_VC6_OBJECTS=$(for i in $ALF_SOURCES; do printf ' out/%s.obj' "$(basename "$i
     printf '\tdel /f out\\*.obj out\\*.exe\n\n'
 ) > Makefile.vc6
 
-# vc6 nt31 makefile
-(
-    printf '# automatically created by makemakefile.sh. DO NOT EDIT!\n'
-    printf '\n'
-    printf 'CXX     = cl.exe\n'
-    printf 'CFLAGS  = -O2 -GA -W3 -DUNICODE -D_UNICODE -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo\n'
-    printf 'LDFLAGS = /link /subsystem:windows,3.10 /entry:_entry kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib\n'
-
-    printf '\n'
-    printf 'out/widgetfactory.exe: out/widgetfactory.obj %s\n' "$ALF_VC6_OBJECTS"
-    printf '\t$(CXX) $(CFLAGS) -Fe$@ $** $(LDFLAGS)\n'
-    printf '\n'
-    for i in $ALF_SOURCES; do
-        printf 'out/%s: %s %s\n' "$(basename "$i" .cpp).obj"  "alf/$i" "$(for k in $ALF_HEADERS; do printf ' alf/%s' "$k"; done)"
-        printf '\t$(CXX) $(CFLAGS) -c -Fo$@ %s\n\n' "alf/$i"
-    done
-
-    printf 'out/widgetfactory.obj: widgetfactory.cpp alf/alf.h\n'
-    printf '\t$(CXX) $(CFLAGS) -c -Fo$@ widgetfactory.cpp\n\n'
-
-
-    printf 'clean:\n'
-    printf '\tdel /f out\\*.obj out\\*.exe\n\n'
-) > Makefile.vc6-nt31
-
 # vc6 ANSI makefile
 (
     printf '# automatically created by makemakefile.sh. DO NOT EDIT!\n'
     printf '\n'
     printf 'CXX     = cl.exe\n'
     printf 'CFLAGS  = -O2 -GA -W3 -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo\n'
-    printf 'LDFLAGS = /link /entry:_entry kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib\n'
+    printf 'LDFLAGS = /link /entry:_entry /opt:nowin98 /fixed:no kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib\n'
 
     printf '\n'
     printf 'out/widgetfactory.exe: out/widgetfactory.obj %s\n' "$ALF_VC6_OBJECTS"
@@ -124,28 +99,3 @@ ALF_VC6_OBJECTS=$(for i in $ALF_SOURCES; do printf ' out/%s.obj' "$(basename "$i
     printf 'clean:\n'
     printf '\tdel /f out\\*.obj out\\*.exe\n\n'
 ) > Makefile.vc6-ansi
-
-# vc6 NT3.1/Win32s ANSI makefile
-(
-    printf '# automatically created by makemakefile.sh. DO NOT EDIT!\n'
-    printf '\n'
-    printf 'CXX     = cl.exe\n'
-    printf 'CFLAGS  = -O2 -GA -W3 -D_WIN32=0x0501 -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0501 -nologo\n'
-    printf 'LDFLAGS = /link /subsystem:windows,3.10 /entry:_entry /fixed:no kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib version.lib\n'
-
-    printf '\n'
-    printf 'out/widgetfactory.exe: out/widgetfactory.obj %s\n' "$ALF_VC6_OBJECTS"
-    printf '\t$(CXX) $(CFLAGS) -Fe$@ $** $(LDFLAGS)\n'
-    printf '\n'
-    for i in $ALF_SOURCES; do
-        printf 'out/%s: %s %s\n' "$(basename "$i" .cpp).obj"  "alf/$i" "$(for k in $ALF_HEADERS; do printf ' alf/%s' "$k"; done)"
-        printf '\t$(CXX) $(CFLAGS) -c -Fo$@ %s\n\n' "alf/$i"
-    done
-
-    printf 'out/widgetfactory.obj: widgetfactory.cpp alf/alf.h\n'
-    printf '\t$(CXX) $(CFLAGS) -c -Fo$@ widgetfactory.cpp\n\n'
-
-
-    printf 'clean:\n'
-    printf '\tdel /f out\\*.obj out\\*.exe\n\n'
-) > Makefile.vc6-ansi-31
diff --git a/widgetfactory.cpp b/widgetfactory.cpp
index 43f4533..3320666 100644
--- a/widgetfactory.cpp
+++ b/widgetfactory.cpp
@@ -382,7 +382,7 @@ WinMain
     return 0;
 }
 
-void
+void WINAPI
 _entry(void)
 {
     ExitProcess((UINT)