Fix packer and ConstructAuto in windows

.vscode/launch.json

@@ -4,6 +4,46 @@
     // Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "(gdb-win) Launch Packer",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}\\packer\\packer.exe",
+            "args": ["--convert", "C:\\Projects\\AwoorwaOLC\\res\\awoorwa.png", "res\\awoorwa.spr"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\MinGW\\mingw32\\bin\\gdb.exe",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
+        {
+            "name": "(gdb-win) Launch Awoorwae",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}\\awoorwae.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "miDebuggerPath": "C:\\MinGW\\mingw32\\bin\\gdb.exe",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        },
         {
             "name": "(gdb) Launch",
             "type": "cppdbg",

Makefile

@@ -3,17 +3,18 @@
 CPPFLAGS=-Wall -Wno-misleading-indentation -Werror --std=c++1z
 LDFLAGS=
 INCLUDES=-Ipge/include
-EXECUTABLE=awoorwae
-PACKER=packer/packer
 ifeq ($(OS),Windows_NT)
 	LIBRARIES=-luser32 -lgdi32 -lopengl32 -lgdiplus -lwinmm
-	EXECUTABLE+=.exe
-	PACKER+=.exe
+	EXECUTABLE=awoorwae.exe
+	PACKER=packer/packer.exe
 	LDFLAGS+=--machine=windows
 	CPP=i686-w64-mingw32-g++
 	CC=i686-w64-mingw32-gcc
+	MAKE=mingw32-make
 else
 	LIBRARIES=-lX11 -lGL -lpthread -lpng -lasound
+	EXECUTABLE=awoorwae
+	PACKER=packer/packer
 	CC=gcc
 	CPP=g++
 endif

packer/Makefile

@@ -1,18 +1,23 @@
-CPPFLAGS=-Wall -Wno-misleading-indentation -Werror --std=c++1z -O3 -flto
+CPPFLAGS=-Wall -Wno-misleading-indentation -Werror --std=c++1z
 LDFLAGS=
 INCLUDES=-I../pge/include
-EXECUTABLE=packer
 ifeq ($(OS),Windows_NT)
 	LIBRARIES=-luser32 -lgdi32 -lgdiplus
-	EXECUTABLE+=.exe
+	EXECUTABLE=packer.exe
 	CPP=i686-w64-mingw32-g++
 	CC=i686-w64-mingw32-gcc
 else
+	EXECUTABLE=packer
 	LIBRARIES=-lpng
 	CC=gcc
 	CPP=g++
 endif
-SOURCES=packer.cpp ../pge/src/olcPGE_ResourcePack.cpp ../pge/src/olcPGE_Sprite.cpp ../pge/src/olcPGE_Pixel.cpp
+ifeq ($(DEBUG),1)
+	CPPFLAGS+=-g -Og
+else
+	CPPFLAGS+=-flto -O3
+endif
+SOURCES=packer.cpp ../pge/src/olcPGE_ResourcePack.cpp ../pge/src/olcPGE_Sprite.cpp ../pge/src/olcPGE_Pixel.cpp ../pge/src/olcPGE_Common.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
 
 all: $(SOURCES) $(EXECUTABLE)

pge/include/olcPGE_Common.h

@@ -5,6 +5,8 @@
 	// Link to libraries
 #ifndef __MINGW32__
 	#pragma comment(lib, "user32.lib")
+	#pragma comment(lib, "gdi32.lib")
+	#pragma comment(lib, "gdiplus.lib")
 #else
 	// In Code::Blocks, Select C++14 in your build options, and add the
 	// following libs to your linker: user32 gdi32 opengl32 gdiplus
@@ -18,6 +20,7 @@
 #endif
 	// Include WinAPI
 	#include <windows.h>
+    #include <gdiplus.h>
 #else
 #endif
 

pge/src/olcPGE_Common.cpp

@@ -14,4 +14,20 @@ namespace olc {
 		return L"SVN FTW!";
 #endif
 	}
+	
+#ifdef _WIN32
+	// Thanks @MaGetzUb for this, which allows sprites to be defined
+	// at construction, by initialising the GDI subsystem
+	static class GDIPlusStartup
+	{
+	public:
+		GDIPlusStartup()
+		{
+			Gdiplus::GdiplusStartupInput startupInput;
+			ULONG_PTR	token;
+			Gdiplus::GdiplusStartup(&token, &startupInput, NULL);
+		};
+	} gdistartup;
+#endif
+
 }

pge/src/olcPixelGameEngine.cpp

@@ -686,10 +686,31 @@ namespace olc
 			nMousePosYcache = 0;
 	}
 
+#ifdef _WIN32
+	static int minWidth;
+	static int minHeight;
+	static WINAPI BOOL MonitorInfoProc(HMONITOR mon, HDC dc, LPRECT rect, LPARAM param) {
+		MONITORINFO info;
+		info.cbSize = sizeof(MONITORINFO);
+		GetMonitorInfo(mon, &info);
+		int w = info.rcWork.right - info.rcWork.left;
+		int h = info.rcWork.bottom - info.rcWork.top;
+		if (w < minWidth) {
+			minWidth = w;
+		}
+		if (h < minHeight) {
+			minHeight = h;
+		}
+		return TRUE;
+	}
+#endif
+
 	uint32_t PixelGameEngine::olc_GetMaximumPixelSize(uint32_t width, uint32_t height) 
 	{
 #ifdef _WIN32
-		return 1; // TODO
+		minWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		minHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+		EnumDisplayMonitors(NULL, NULL, &MonitorInfoProc, 0);
 #else
 		Display* d = XOpenDisplay(NULL);
 		int defaultScreen = DefaultScreen(d);
@@ -705,13 +726,12 @@ namespace olc
 			if (HeightOfScreen(s) < minHeight) {
 				minHeight = HeightOfScreen(s);
 			}
-		}
-
+		}		
+#endif
 		uint32_t pixelWidth = minWidth / width;
 		uint32_t pixelHeight = minHeight / height;
 
-		return std::min(pixelWidth, pixelHeight);		
-#endif
+		return std::min(pixelWidth, pixelHeight);
 	}
 
 	void PixelGameEngine::EngineThread()
@@ -959,22 +979,6 @@ namespace olc
 
 	}
 
-#ifdef _WIN32
-	// Thanks @MaGetzUb for this, which allows sprites to be defined
-	// at construction, by initialising the GDI subsystem
-	static class GDIPlusStartup
-	{
-	public:
-		GDIPlusStartup()
-		{
-			Gdiplus::GdiplusStartupInput startupInput;
-			ULONG_PTR	token;
-			Gdiplus::GdiplusStartup(&token, &startupInput, NULL);
-		};
-	} gdistartup;
-#endif
-
-
 	void PixelGameEngine::olc_ConstructFontSheet()
 	{
 		std::string data;