msvc project: use multibyte character set (to avoid wide win32 functions)

diff --git a/andemo.vcxproj b/andemo.vcxproj
index 8de57f5..d94e4cc 100644 (file)
--- a/andemo.vcxproj
+++ b/andemo.vcxproj
@@ -73,11 +73,13 @@
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r

diff --git a/libs/anim/anim.vcxproj b/libs/anim/anim.vcxproj
index 3b8c939..0c4d738 100644 (file)
--- a/libs/anim/anim.vcxproj
+++ b/libs/anim/anim.vcxproj
@@ -54,14 +54,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r

diff --git a/libs/imago/imago.vcxproj b/libs/imago/imago.vcxproj
index d9c0abe..fb9f506 100644 (file)
--- a/libs/imago/imago.vcxproj
+++ b/libs/imago/imago.vcxproj
@@ -159,14 +159,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r

diff --git a/libs/imago/src/imago_gl.c b/libs/imago/src/imago_gl.c
index b69efb5..f6371cf 100644 (file)
--- a/libs/imago/src/imago_gl.c
+++ b/libs/imago/src/imago_gl.c
@@ -285,7 +285,7 @@ unsigned int img_gltexture_read(struct img_io *io)
 #endif
 
 #endif
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -301,7 +301,7 @@ static int load_glfunc(void)
        gl_pixel_storei = (gl_pixel_storei_func)dlsym(RTLD_DEFAULT, "glPixelStorei");
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
        HANDLE dll = LoadLibrary("opengl32.dll");
        if(dll) {
                gl_gen_textures = (gl_gen_textures_func)GetProcAddress(dll, "glGenTextures");

diff --git a/libs/psys/psys.vcxproj b/libs/psys/psys.vcxproj
index 0692237..22b4ff0 100644 (file)
--- a/libs/psys/psys.vcxproj
+++ b/libs/psys/psys.vcxproj
@@ -55,14 +55,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r

diff --git a/libs/treestore/treestore.vcxproj b/libs/treestore/treestore.vcxproj
index 2a887bb..7cf988c 100644 (file)
--- a/libs/treestore/treestore.vcxproj
+++ b/libs/treestore/treestore.vcxproj
@@ -52,14 +52,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>true</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseDebugLibraries>false</UseDebugLibraries>\r
     <PlatformToolset>v143</PlatformToolset>\r
     <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r

diff --git a/src/pc/miniglut.c b/src/pc/miniglut.c
index 1efbea3..e4a5150 100644 (file)
--- a/src/pc/miniglut.c
+++ b/src/pc/miniglut.c
@@ -1,6 +1,6 @@
 /*
 MiniGLUT - minimal GLUT subset without dependencies
-Copyright (C) 2020  John Tsiombikas <nuclear@member.fsf.org>
+Copyright (C) 2020-2022  John Tsiombikas <nuclear@member.fsf.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
 #if defined(__unix__)
 
 #include <X11/Xlib.h>
@@ -50,7 +49,7 @@ static int have_netwm_fullscr(void);
 #include <windows.h>
 #define BUILD_WIN32
 
-static HRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam);
+static LRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam);
 
 static HINSTANCE hinst;
 static HWND win;
@@ -1532,7 +1531,7 @@ static void create_window(const char *title)
        reshape_pending = 1;
 }
 
-static HRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam)
+static LRESULT CALLBACK handle_message(HWND win, unsigned int msg, WPARAM wparam, LPARAM lparam)
 {
        static int mouse_x, mouse_y;
        int x, y, key;

diff --git a/src/pc/miniglut.h b/src/pc/miniglut.h
index a757369..af13791 100644 (file)
--- a/src/pc/miniglut.h
+++ b/src/pc/miniglut.h
@@ -1,6 +1,6 @@
 /*
 MiniGLUT - minimal GLUT subset without dependencies
-Copyright (C) 2020  John Tsiombikas <nuclear@member.fsf.org>
+Copyright (C) 2020-2022  John Tsiombikas <nuclear@member.fsf.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by