Merge branch 'PathOfBuildingCommunity:master' into fontin-fonts

Blitz54 · web-flow · commit 17943bacc153 · 2025-10-20T03:56:38.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -86,6 +86,7 @@ endif()
 if (WIN32)
     set (SIMPLEGRAPHIC_PLATFORM_SOURCES
         "engine/system/win/sys_console.cpp"
+        "SimpleGraphic.rc"
     )
 else()
     set (SIMPLEGRAPHIC_PLATFORM_SOURCES
diff --git a/SimpleGraphic.rc b/SimpleGraphic.rc
diff --git a/config.h b/config.h
@@ -4,7 +4,8 @@
 // Configuration
 //
 
-#define CFG_VERSION		"SimpleGraphic v2.2"
+#define CFG_VERSION_NUM "2.2"
+#define CFG_VERSION		"SimpleGraphic v" CFG_VERSION_NUM
 #define CFG_TITLE		"SimpleGraphic"
 #define CFG_LOGFILE		"SimpleGraphic/SimpleGraphic.log"
 #define CFG_DATAPATH	"SimpleGraphic/"
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "path-of-building-simplegraphic",
-  "version": "2.0",
+  "version": "2.2",
   "dependencies": [
     "angle",
     "curl",
@@ -15,4 +15,4 @@
     "zstd",
     "zlib"
   ]
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ endif()`
`86`	`86`	`if (WIN32)`
`87`	`87`	`set (SIMPLEGRAPHIC_PLATFORM_SOURCES`
`88`	`88`	`"engine/system/win/sys_console.cpp"`
	`89`	`+ "SimpleGraphic.rc"`
`89`	`90`	`)`
`90`	`91`	`else()`
`91`	`92`	`set (SIMPLEGRAPHIC_PLATFORM_SOURCES`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "path-of-building-simplegraphic",`
`3`		`- "version": "2.0",`
	`3`	`+ "version": "2.2",`
`4`	`4`	`"dependencies": [`
`5`	`5`	`"angle",`
`6`	`6`	`"curl",`
`@@ -15,4 +15,4 @@`
`15`	`15`	`"zstd",`
`16`	`16`	`"zlib"`
`17`	`17`	`]`
`18`		`-}`
	`18`	`+}`