some windows build updates

Author: casper-boon

Makefile

@@ -279,12 +279,12 @@ endif
 RES=
 RESP=
 ifeq ($(WITH_PLOTS),true)
-  LIBS+=-L$(PLOTDIR)/lib -lplot -lgd -ljpeg -lm
+  LIBS+=-L$(PLOTDIR)/lib -lplot -lgd
   ifeq ($(WITH_XPLOTS),true)
     ifeq ($(OSTYPE),Darwin)
       LIBS+=-framework Cocoa
     else ifeq ($(OSTYPE),Msys)
-      LIBS+=-lpng16 -lz -lcomdlg32 -lgdi32
+      LIBS+=-lgdi32
       RES=${objdir}/glm_rc.o
       RESP=${objdir}/glm+_rc.o
     else
@@ -365,10 +365,10 @@ ${moddir}:
 	@mkdir ${moddir}
 
 glm: ${objdir} ${moddir} $(OBJS) $(GLM_DEPS) $(RES)
-	$(LINK) -o $@ $(EXTRALINKFLAGS) $(OBJS) $(RES) $(LIBS) $(WQLIBS) $(FLIBS)
+	$(LINK) -o $@ $(EXTRALINKFLAGS) $(OBJS) $(RES) $(WQLIBS) $(LIBS) $(FLIBS)
 
 glm+: ${objdir} ${moddir} $(OBJS) $(GLM_DEPS) $(RESP)
-	$(LINK) -o $@ $(EXTRALINKFLAGS) $(OBJS) $(RESP) $(LIBS) $(WQLIBS) $(FLIBS)
+	$(LINK) -o $@ $(EXTRALINKFLAGS) $(OBJS) $(RESP) $(WQLIBS) $(LIBS) $(FLIBS)
 
 clean: ${objdir} ${moddir}
 	@touch ${objdir}/1.o ${moddir}/1.mod 1.t 1__genmod.f90 glm 1.${so_ext} glm_test_bird macos/glm.app macos/glm+.app

debian/changelog

@@ -1,4 +1,4 @@
-glm (3.3.1a11-0) UNRELEASED; urgency=low
+glm (3.3.1a12-0) UNRELEASED; urgency=low
 
   * new version 3.2.0a1
   * new version 3.2.0a8
@@ -23,8 +23,9 @@ glm (3.3.1a11-0) UNRELEASED; urgency=low
   * new version 3.3.1a9
   * new version 3.3.1a10
   * new version 3.3.1a11
+  * new version 3.3.1a12
 
- -- Casper Boon <casper@ringneck>  Fri, 13 Oct 2023 12:04:03 +0800
+ -- Casper Boon <casper@oldmail.local.ambinet.com.au>  Thu, 29 Feb 2024 10:21:42 +0800
 
 glm (3.1.0-0) UNRELEASED; urgency=low
 

debian/rules

@@ -2,7 +2,7 @@
 
 package=glm
 year=2021
-version=3.3.1a11
+version=3.3.1a12
 release=0.0
 
 #export DH_VERBOSE=1

win/glm+.rc

@@ -27,8 +27,8 @@ END
 
 //==============================================================================
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,1,0xa11
- PRODUCTVERSION 3,3,1,0xa11
+ FILEVERSION 3,3,1,0xa12
+ PRODUCTVERSION 3,3,1,0xa12
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "AED Group; University of Western Australia"
             VALUE "FileDescription", "General Lake Model (GLM) with AED+"
-            VALUE "FileVersion", "3.3.1a11 \0"
+            VALUE "FileVersion", "3.3.1a12 \0"
             VALUE "InternalName", "version.rc"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "version.rc"
             VALUE "ProductName", "GLM+"
-            VALUE "ProductVersion", "3.3.1a11 \0"
+            VALUE "ProductVersion", "3.3.1a12 \0"
         END
     END
     BLOCK "VarFileInfo"

win/glm.rc

@@ -27,8 +27,8 @@ END
 
 //==============================================================================
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,1,0xa11
- PRODUCTVERSION 3,3,1,0xa11
+ FILEVERSION 3,3,1,0xa12
+ PRODUCTVERSION 3,3,1,0xa12
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "AED Group; University of Western Australia"
             VALUE "FileDescription", "General Lake Model (GLM)"
-            VALUE "FileVersion", "3.3.1a11 \0"
+            VALUE "FileVersion", "3.3.1a12 \0"
             VALUE "InternalName", "version.rc"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "version.rc"
             VALUE "ProductName", "GLM"
-            VALUE "ProductVersion", "3.3.1a11 \0"
+            VALUE "ProductVersion", "3.3.1a12 \0"
         END
     END
     BLOCK "VarFileInfo"