windows build with msvc2022
authorJohn Tsiombikas <nuclear@mutantstargoat.com>
Fri, 31 Dec 2021 09:36:27 +0000 (11:36 +0200)
committerJohn Tsiombikas <nuclear@mutantstargoat.com>
Fri, 31 Dec 2021 09:36:27 +0000 (11:36 +0200)
23 files changed:
.gitignore
andemo.sln [new file with mode: 0644]
andemo.vcxproj [new file with mode: 0644]
andemo.vcxproj.filters [new file with mode: 0644]
libs/anim/anim.vcxproj [new file with mode: 0644]
libs/anim/anim.vcxproj.filters [new file with mode: 0644]
libs/imago/imago.vcxproj [new file with mode: 0644]
libs/imago/imago.vcxproj.filters [new file with mode: 0644]
libs/imago/src/filelbm.c
libs/imago/src/filetga.c
libs/psys/pattr.c
libs/psys/psys.c
libs/psys/psys.vcxproj [new file with mode: 0644]
libs/psys/psys.vcxproj.filters [new file with mode: 0644]
libs/treestore/README.md [deleted file]
libs/treestore/treestore.c
libs/treestore/treestore.vcxproj [new file with mode: 0644]
libs/treestore/treestore.vcxproj.filters [new file with mode: 0644]
src/opengl.c
src/pc/assfilepc.c [new file with mode: 0644]
src/pc/assman.c [deleted file]
src/pc/miniglut.c
src/util.h

index bb59f12..c9e8abc 100644 (file)
@@ -10,3 +10,6 @@ data
 apkbuild
 *.exe
 *.cfg
+x64
+.vs
+*.vcxproj.user
diff --git a/andemo.sln b/andemo.sln
new file mode 100644 (file)
index 0000000..5c8a6ac
--- /dev/null
@@ -0,0 +1,77 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio Version 17\r
+VisualStudioVersion = 17.0.32014.148\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "andemo", "andemo.vcxproj", "{B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03} = {D582831C-F361-46BD-AC2E-ECDDD1565E03}\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D} = {F2E34635-B8E5-4C07-9652-C485EE884D3D}\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E} = {D46E73D9-6C99-45AF-8B93-BFF37D12452E}\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A} = {11B73DF9-52BE-426F-A330-58DDF2471C1A}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imago", "libs\imago\imago.vcxproj", "{D582831C-F361-46BD-AC2E-ECDDD1565E03}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treestore", "libs\treestore\treestore.vcxproj", "{F2E34635-B8E5-4C07-9652-C485EE884D3D}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psys", "libs\psys\psys.vcxproj", "{11B73DF9-52BE-426F-A330-58DDF2471C1A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "anim", "libs\anim\anim.vcxproj", "{D46E73D9-6C99-45AF-8B93-BFF37D12452E}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|x64 = Debug|x64\r
+               Debug|x86 = Debug|x86\r
+               Release|x64 = Release|x64\r
+               Release|x86 = Release|x86\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Debug|x64.ActiveCfg = Debug|x64\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Debug|x64.Build.0 = Debug|x64\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Debug|x86.Build.0 = Debug|Win32\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Release|x64.ActiveCfg = Release|x64\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Release|x64.Build.0 = Release|x64\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Release|x86.ActiveCfg = Release|Win32\r
+               {B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}.Release|x86.Build.0 = Release|Win32\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Debug|x64.ActiveCfg = Debug|x64\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Debug|x64.Build.0 = Debug|x64\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Debug|x86.Build.0 = Debug|Win32\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Release|x64.ActiveCfg = Release|x64\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Release|x64.Build.0 = Release|x64\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Release|x86.ActiveCfg = Release|Win32\r
+               {D582831C-F361-46BD-AC2E-ECDDD1565E03}.Release|x86.Build.0 = Release|Win32\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Debug|x64.ActiveCfg = Debug|x64\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Debug|x64.Build.0 = Debug|x64\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Debug|x86.Build.0 = Debug|Win32\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Release|x64.ActiveCfg = Release|x64\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Release|x64.Build.0 = Release|x64\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Release|x86.ActiveCfg = Release|Win32\r
+               {F2E34635-B8E5-4C07-9652-C485EE884D3D}.Release|x86.Build.0 = Release|Win32\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Debug|x64.ActiveCfg = Debug|x64\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Debug|x64.Build.0 = Debug|x64\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Debug|x86.Build.0 = Debug|Win32\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Release|x64.ActiveCfg = Release|x64\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Release|x64.Build.0 = Release|x64\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Release|x86.ActiveCfg = Release|Win32\r
+               {11B73DF9-52BE-426F-A330-58DDF2471C1A}.Release|x86.Build.0 = Release|Win32\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Debug|x64.ActiveCfg = Debug|x64\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Debug|x64.Build.0 = Debug|x64\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Debug|x86.Build.0 = Debug|Win32\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Release|x64.ActiveCfg = Release|x64\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Release|x64.Build.0 = Release|x64\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Release|x86.ActiveCfg = Release|Win32\r
+               {D46E73D9-6C99-45AF-8B93-BFF37D12452E}.Release|x86.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+       GlobalSection(ExtensibilityGlobals) = postSolution\r
+               SolutionGuid = {942C937E-081F-48A2-B8A6-E03214A5E1A5}\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/andemo.vcxproj b/andemo.vcxproj
new file mode 100644 (file)
index 0000000..8de57f5
--- /dev/null
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="libs\glew\glew.c" />\r
+    <ClCompile Include="src\assfile.c" />\r
+    <ClCompile Include="src\assman.c" />\r
+    <ClCompile Include="src\cfgopt.c" />\r
+    <ClCompile Include="src\darray.c" />\r
+    <ClCompile Include="src\demo.c" />\r
+    <ClCompile Include="src\demosys.c" />\r
+    <ClCompile Include="src\noise.c" />\r
+    <ClCompile Include="src\opengl.c" />\r
+    <ClCompile Include="src\pc\assfilepc.c" />\r
+    <ClCompile Include="src\pc\main.c" />\r
+    <ClCompile Include="src\pc\miniglut.c" />\r
+    <ClCompile Include="src\rbtree.c" />\r
+    <ClCompile Include="src\sanegl.c" />\r
+    <ClCompile Include="src\scr\testa.c" />\r
+    <ClCompile Include="src\scr\testb.c" />\r
+    <ClCompile Include="src\sdr.c" />\r
+    <ClCompile Include="src\util.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="src\assfile.h" />\r
+    <ClInclude Include="src\assman.h" />\r
+    <ClInclude Include="src\cfgopt.h" />\r
+    <ClInclude Include="src\darray.h" />\r
+    <ClInclude Include="src\demo.h" />\r
+    <ClInclude Include="src\demosys.h" />\r
+    <ClInclude Include="src\noise.h" />\r
+    <ClInclude Include="src\opengl.h" />\r
+    <ClInclude Include="src\pc\miniglut.h" />\r
+    <ClInclude Include="src\rbtree.h" />\r
+    <ClInclude Include="src\sanegl.h" />\r
+    <ClInclude Include="src\sdr.h" />\r
+    <ClInclude Include="src\util.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <VCProjectVersion>17.0</VCProjectVersion>\r
+    <ProjectGuid>{B71818F8-BCC8-4A8C-B5E4-EFACC83B78E2}</ProjectGuid>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;MINIGLUT_USE_LIBC;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>src;libs;libs\imago\src;libs\treestore;libs\glew;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <Optimization>Disabled</Optimization>\r
+    </ClCompile>\r
+    <Link>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;MINIGLUT_USE_LIBC;GLEW_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>src;libs;libs\imago\src;libs\treestore;libs\glew;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;MINIGLUT_USE_LIBC;GLEW_STATIC</PreprocessorDefinitions>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs;$(SolutionDir)\libs\imago\src;$(SolutionDir)\libs\treestore;$(SolutionDir)\libs\glew</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>imago.lib;anim.lib;psys.lib;treestore.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;MINIGLUT_USE_LIBC;GLEW_STATIC</PreprocessorDefinitions>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\src;$(SolutionDir)\libs;$(SolutionDir)\libs\imago\src;$(SolutionDir)\libs\treestore;$(SolutionDir)\libs\glew</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>imago.lib;anim.lib;psys.lib;treestore.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/andemo.vcxproj.filters b/andemo.vcxproj.filters
new file mode 100644 (file)
index 0000000..60fbfb5
--- /dev/null
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>\r
+    </Filter>\r
+    <Filter Include="src">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="src\screens">\r
+      <UniqueIdentifier>{bcc53176-9ffe-43e8-91b8-126cb891876f}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="src\assfile.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\assman.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\cfgopt.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\darray.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\demo.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\demosys.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\noise.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\opengl.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\rbtree.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\sanegl.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\sdr.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\util.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\scr\testa.c">\r
+      <Filter>src\screens</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\scr\testb.c">\r
+      <Filter>src\screens</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\pc\main.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\pc\miniglut.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\pc\assfilepc.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libs\glew\glew.c">\r
+      <Filter>src</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="src\assfile.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\assman.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\cfgopt.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\darray.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\demo.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\demosys.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\noise.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\opengl.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\rbtree.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\sanegl.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\sdr.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\util.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\pc\miniglut.h">\r
+      <Filter>src</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/anim/anim.vcxproj b/libs/anim/anim.vcxproj
new file mode 100644 (file)
index 0000000..3b8c939
--- /dev/null
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="anim.c" />\r
+    <ClCompile Include="dynarr.c" />\r
+    <ClCompile Include="track.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="anim.h" />\r
+    <ClInclude Include="config.h" />\r
+    <ClInclude Include="dynarr.h" />\r
+    <ClInclude Include="track.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <VCProjectVersion>16.0</VCProjectVersion>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{d46e73d9-6c99-45af-8b93-bff37d12452e}</ProjectGuid>\r
+    <RootNamespace>anim</RootNamespace>\r
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</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
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/anim/anim.vcxproj.filters b/libs/anim/anim.vcxproj.filters
new file mode 100644 (file)
index 0000000..f5ee627
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="anim.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="dynarr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="track.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="anim.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="config.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="dynarr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="track.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/imago/imago.vcxproj b/libs/imago/imago.vcxproj
new file mode 100644 (file)
index 0000000..d9c0abe
--- /dev/null
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="jpeglib\jcapimin.c" />\r
+    <ClCompile Include="jpeglib\jcapistd.c" />\r
+    <ClCompile Include="jpeglib\jccoefct.c" />\r
+    <ClCompile Include="jpeglib\jccolor.c" />\r
+    <ClCompile Include="jpeglib\jcdctmgr.c" />\r
+    <ClCompile Include="jpeglib\jchuff.c" />\r
+    <ClCompile Include="jpeglib\jcinit.c" />\r
+    <ClCompile Include="jpeglib\jcmainct.c" />\r
+    <ClCompile Include="jpeglib\jcmarker.c" />\r
+    <ClCompile Include="jpeglib\jcmaster.c" />\r
+    <ClCompile Include="jpeglib\jcomapi.c" />\r
+    <ClCompile Include="jpeglib\jcparam.c" />\r
+    <ClCompile Include="jpeglib\jcphuff.c" />\r
+    <ClCompile Include="jpeglib\jcprepct.c" />\r
+    <ClCompile Include="jpeglib\jcsample.c" />\r
+    <ClCompile Include="jpeglib\jctrans.c" />\r
+    <ClCompile Include="jpeglib\jdapimin.c" />\r
+    <ClCompile Include="jpeglib\jdapistd.c" />\r
+    <ClCompile Include="jpeglib\jdatadst.c" />\r
+    <ClCompile Include="jpeglib\jdatasrc.c" />\r
+    <ClCompile Include="jpeglib\jdcoefct.c" />\r
+    <ClCompile Include="jpeglib\jdcolor.c" />\r
+    <ClCompile Include="jpeglib\jddctmgr.c" />\r
+    <ClCompile Include="jpeglib\jdhuff.c" />\r
+    <ClCompile Include="jpeglib\jdinput.c" />\r
+    <ClCompile Include="jpeglib\jdmainct.c" />\r
+    <ClCompile Include="jpeglib\jdmarker.c" />\r
+    <ClCompile Include="jpeglib\jdmaster.c" />\r
+    <ClCompile Include="jpeglib\jdmerge.c" />\r
+    <ClCompile Include="jpeglib\jdphuff.c" />\r
+    <ClCompile Include="jpeglib\jdpostct.c" />\r
+    <ClCompile Include="jpeglib\jdsample.c" />\r
+    <ClCompile Include="jpeglib\jdtrans.c" />\r
+    <ClCompile Include="jpeglib\jerror.c" />\r
+    <ClCompile Include="jpeglib\jfdctflt.c" />\r
+    <ClCompile Include="jpeglib\jfdctfst.c" />\r
+    <ClCompile Include="jpeglib\jfdctint.c" />\r
+    <ClCompile Include="jpeglib\jidctflt.c" />\r
+    <ClCompile Include="jpeglib\jidctfst.c" />\r
+    <ClCompile Include="jpeglib\jidctint.c" />\r
+    <ClCompile Include="jpeglib\jidctred.c" />\r
+    <ClCompile Include="jpeglib\jmemmgr.c" />\r
+    <ClCompile Include="jpeglib\jmemnobs.c" />\r
+    <ClCompile Include="jpeglib\jquant1.c" />\r
+    <ClCompile Include="jpeglib\jquant2.c" />\r
+    <ClCompile Include="jpeglib\jutils.c" />\r
+    <ClCompile Include="libpng\png.c" />\r
+    <ClCompile Include="libpng\pngerror.c" />\r
+    <ClCompile Include="libpng\pngget.c" />\r
+    <ClCompile Include="libpng\pngmem.c" />\r
+    <ClCompile Include="libpng\pngpread.c" />\r
+    <ClCompile Include="libpng\pngread.c" />\r
+    <ClCompile Include="libpng\pngrio.c" />\r
+    <ClCompile Include="libpng\pngrtran.c" />\r
+    <ClCompile Include="libpng\pngrutil.c" />\r
+    <ClCompile Include="libpng\pngset.c" />\r
+    <ClCompile Include="libpng\pngtrans.c" />\r
+    <ClCompile Include="libpng\pngwio.c" />\r
+    <ClCompile Include="libpng\pngwrite.c" />\r
+    <ClCompile Include="libpng\pngwtran.c" />\r
+    <ClCompile Include="libpng\pngwutil.c" />\r
+    <ClCompile Include="src\byteord.c" />\r
+    <ClCompile Include="src\conv.c" />\r
+    <ClCompile Include="src\filejpeg.c" />\r
+    <ClCompile Include="src\filelbm.c" />\r
+    <ClCompile Include="src\filepng.c" />\r
+    <ClCompile Include="src\fileppm.c" />\r
+    <ClCompile Include="src\filergbe.c" />\r
+    <ClCompile Include="src\filetga.c" />\r
+    <ClCompile Include="src\ftmodule.c" />\r
+    <ClCompile Include="src\imago2.c" />\r
+    <ClCompile Include="src\imago_gl.c" />\r
+    <ClCompile Include="src\modules.c" />\r
+    <ClCompile Include="zlib\adler32.c" />\r
+    <ClCompile Include="zlib\compress.c" />\r
+    <ClCompile Include="zlib\crc32.c" />\r
+    <ClCompile Include="zlib\deflate.c" />\r
+    <ClCompile Include="zlib\gzio.c" />\r
+    <ClCompile Include="zlib\infback.c" />\r
+    <ClCompile Include="zlib\inffast.c" />\r
+    <ClCompile Include="zlib\inflate.c" />\r
+    <ClCompile Include="zlib\inftrees.c" />\r
+    <ClCompile Include="zlib\trees.c" />\r
+    <ClCompile Include="zlib\uncompr.c" />\r
+    <ClCompile Include="zlib\zutil.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="jpeglib\cderror.h" />\r
+    <ClInclude Include="jpeglib\jchuff.h" />\r
+    <ClInclude Include="jpeglib\jconfig.h" />\r
+    <ClInclude Include="jpeglib\jdct.h" />\r
+    <ClInclude Include="jpeglib\jdhuff.h" />\r
+    <ClInclude Include="jpeglib\jerror.h" />\r
+    <ClInclude Include="jpeglib\jinclude.h" />\r
+    <ClInclude Include="jpeglib\jmemsys.h" />\r
+    <ClInclude Include="jpeglib\jmorecfg.h" />\r
+    <ClInclude Include="jpeglib\jpegint.h" />\r
+    <ClInclude Include="jpeglib\jpeglib.h" />\r
+    <ClInclude Include="jpeglib\jversion.h" />\r
+    <ClInclude Include="libpng\png.h" />\r
+    <ClInclude Include="libpng\pngconf.h" />\r
+    <ClInclude Include="src\byteord.h" />\r
+    <ClInclude Include="src\ftmodule.h" />\r
+    <ClInclude Include="src\imago2.h" />\r
+    <ClInclude Include="zlib\crc32.h" />\r
+    <ClInclude Include="zlib\deflate.h" />\r
+    <ClInclude Include="zlib\inffast.h" />\r
+    <ClInclude Include="zlib\inffixed.h" />\r
+    <ClInclude Include="zlib\inflate.h" />\r
+    <ClInclude Include="zlib\inftrees.h" />\r
+    <ClInclude Include="zlib\trees.h" />\r
+    <ClInclude Include="zlib\zconf.h" />\r
+    <ClInclude Include="zlib\zlib.h" />\r
+    <ClInclude Include="zlib\zutil.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <VCProjectVersion>16.0</VCProjectVersion>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{d582831c-f361-46bd-ac2e-ecddd1565e03}</ProjectGuid>\r
+    <RootNamespace>imago</RootNamespace>\r
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</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
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\imago\zlib;$(SolutionDir)\libs\imago\libpng;$(SolutionDir)\libs\imago\jpeglib</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs\imago\zlib;$(SolutionDir)\libs\imago\libpng;$(SolutionDir)\libs\imago\jpeglib</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/imago/imago.vcxproj.filters b/libs/imago/imago.vcxproj.filters
new file mode 100644 (file)
index 0000000..35912a8
--- /dev/null
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+    <Filter Include="zlib">\r
+      <UniqueIdentifier>{79f5a32a-a071-46a7-a7f6-319719a9e237}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="libpng">\r
+      <UniqueIdentifier>{08ae6bb2-3c44-4ff7-907e-6780d6a844e2}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="jpeglib">\r
+      <UniqueIdentifier>{2407aabc-da74-4fc6-afba-737c937dde4f}</UniqueIdentifier>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="zlib\adler32.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\compress.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\crc32.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\deflate.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\gzio.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\infback.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\inffast.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\inflate.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\inftrees.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\trees.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\uncompr.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="zlib\zutil.c">\r
+      <Filter>zlib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\png.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngerror.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngget.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngmem.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngpread.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngread.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngrio.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngrtran.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngrutil.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngset.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngtrans.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngwio.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngwrite.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngwtran.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="libpng\pngwutil.c">\r
+      <Filter>libpng</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcapimin.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcapistd.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jccoefct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jccolor.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcdctmgr.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jchuff.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcinit.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcmainct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcmarker.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcmaster.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcomapi.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcparam.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcphuff.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcprepct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jcsample.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jctrans.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdapimin.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdapistd.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdatadst.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdatasrc.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdcoefct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdcolor.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jddctmgr.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdhuff.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdinput.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdmainct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdmarker.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdmaster.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdmerge.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdphuff.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdpostct.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdsample.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jdtrans.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jerror.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jfdctflt.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jfdctfst.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jfdctint.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jidctflt.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jidctfst.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jidctint.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jidctred.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jmemmgr.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jmemnobs.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jquant1.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jquant2.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="jpeglib\jutils.c">\r
+      <Filter>jpeglib</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\byteord.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\conv.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\filejpeg.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\filelbm.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\filepng.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\fileppm.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\filergbe.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\filetga.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\ftmodule.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\imago_gl.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\imago2.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="src\modules.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="zlib\crc32.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\deflate.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\inffast.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\inffixed.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\inflate.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\inftrees.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\trees.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\zconf.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\zlib.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="zlib\zutil.h">\r
+      <Filter>zlib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="libpng\png.h">\r
+      <Filter>libpng</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="libpng\pngconf.h">\r
+      <Filter>libpng</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\cderror.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jchuff.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jconfig.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jdct.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jdhuff.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jerror.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jinclude.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jmemsys.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jmorecfg.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jpegint.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jpeglib.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="jpeglib\jversion.h">\r
+      <Filter>jpeglib</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\byteord.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\ftmodule.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="src\imago2.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
index 9e3799d..d0bb3f0 100644 (file)
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#if defined(__WATCOMC__) || defined(WIN32)
+#if defined(__WATCOMC__) || defined(_WIN32)
 #include <malloc.h>
 #else
 #ifndef __FreeBSD__
index d5d9fe8..f34c9ea 100644 (file)
@@ -138,7 +138,7 @@ static int read_tga(struct img_pixmap *img, struct img_io *io)
        if(hdr.cmap_type == 1) {
                cmap.ncolors = hdr.cmap_len;
 
-               for(i=0; i<hdr.cmap_len; i++) {
+               for(i=0; i<(int)hdr.cmap_len; i++) {
                        switch(hdr.cmap_entry_sz) {
                        case 16:
                                c = img_read_int16_le(io);
@@ -190,13 +190,13 @@ static int read_tga(struct img_pixmap *img, struct img_io *io)
                return -1;
        }
 
-       for(i=0; i<y; i++) {
+       for(i=0; i<(int)y; i++) {
                unsigned char *ptr;
                int j, k;
 
                ptr = (unsigned char*)img->pixels + ((hdr.img_desc & 0x20) ? i : y - (i + 1)) * x * pixel_bytes;
 
-               for(j=0; j<x; j++) {
+               for(j=0; j<(int)x; j++) {
                        /* if the image is raw, then just read the next pixel */
                        if(!IS_RLE(hdr.img_type)) {
                                if(read_pixel(io, fmt, ptr) == -1) {
index 8046e02..7c161cb 100644 (file)
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <ctype.h>
 #include <assert.h>
 
-#ifdef __MSVCRT__
+#ifdef _WIN32
 #include <malloc.h>
 #else
 #include <alloca.h>
index 6825ae7..25f2487 100644 (file)
@@ -21,7 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <float.h>
 #include <assert.h>
 #include "psys.h"
+#ifdef PSYS_MULTITHREADED
 #include <pthread.h>
+#endif
 
 static int spawn_particle(struct psys_emitter *em, struct psys_particle *p);
 static void update_particle(struct psys_emitter *em, struct psys_particle *p, long tm, float dt, void *cls);
@@ -29,7 +31,9 @@ static void update_particle(struct psys_emitter *em, struct psys_particle *p, lo
 /* particle pool */
 static struct psys_particle *ppool;
 static int ppool_size;
+#ifdef PSYS_MULTITHREADED
 static pthread_mutex_t pool_lock = PTHREAD_MUTEX_INITIALIZER;
+#endif
 
 static struct psys_particle *palloc(void);
 static void pfree(struct psys_particle *p);
@@ -347,7 +351,9 @@ static struct psys_particle *palloc(void)
 {
        struct psys_particle *p;
 
+#ifdef PSYS_MULTITHREADED
        pthread_mutex_lock(&pool_lock);
+#endif
        if(ppool) {
                p = ppool;
                ppool = ppool->next;
@@ -355,16 +361,22 @@ static struct psys_particle *palloc(void)
        } else {
                p = malloc(sizeof *p);
        }
+#ifdef PSYS_MULTITHREADED
        pthread_mutex_unlock(&pool_lock);
+#endif
 
        return p;
 }
 
 static void pfree(struct psys_particle *p)
 {
+#ifdef PSYS_MULTITHREADED
        pthread_mutex_lock(&pool_lock);
+#endif
        p->next = ppool;
        ppool = p;
        ppool_size++;
+#ifdef PSYS_MULTITHREADED
        pthread_mutex_unlock(&pool_lock);
+#endif
 }
diff --git a/libs/psys/psys.vcxproj b/libs/psys/psys.vcxproj
new file mode 100644 (file)
index 0000000..0692237
--- /dev/null
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="pattr.c" />\r
+    <ClCompile Include="pstrack.c" />\r
+    <ClCompile Include="psys.c" />\r
+    <ClCompile Include="rndval.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="pattr.h" />\r
+    <ClInclude Include="pstrack.h" />\r
+    <ClInclude Include="psys.h" />\r
+    <ClInclude Include="rndval.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <VCProjectVersion>16.0</VCProjectVersion>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{11b73df9-52be-426f-a330-58ddf2471c1a}</ProjectGuid>\r
+    <RootNamespace>psys</RootNamespace>\r
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</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
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories>$(SolutionDir)\libs</AdditionalIncludeDirectories>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/psys/psys.vcxproj.filters b/libs/psys/psys.vcxproj.filters
new file mode 100644 (file)
index 0000000..182dc0f
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="pattr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="pstrack.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="psys.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="rndval.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="pattr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="pstrack.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="psys.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="rndval.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/treestore/README.md b/libs/treestore/README.md
deleted file mode 100644 (file)
index f75efa9..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-libtreestore
-============
-
-Libtreestore is a simple C library for reading/writing hierarchical data in a
-json-like text format, or a chunk-based binary format.
-
-A better way to describe the text format is like XML without the CDATA, and with
-curly braces instead of tags:
-
-```
-rootnode {
-    some_attribute = "some_string_value"
-    some_numeric_attrib = 10
-    vector_attrib = [255, 128, 0]
-    array_attrib = ["tom", "dick", "harry"]
-
-    # you can have multiple nodes with the same name
-    childnode {
-        childattr = "whatever"
-    }
-    childnode {
-        another_childattr = "xyzzy"
-    }
-}
-```
-
-License
--------
-Copyright (C) 2016-2019 John Tsiombikas <nuclear@member.fsf.org>
-
-Libtreestore is free software. Feel free to use, modify, and/or redistribute
-it, under the terms of the MIT/X11 license. See LICENSE for detauls.
-
-Issues
-------
-At the moment only the text format has been implemented.
-
-More info soon...
index 899cfa0..7343b9d 100644 (file)
@@ -5,7 +5,7 @@
 #include <assert.h>
 #include "treestore.h"
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <malloc.h>
 #else
 #include <alloca.h>
diff --git a/libs/treestore/treestore.vcxproj b/libs/treestore/treestore.vcxproj
new file mode 100644 (file)
index 0000000..2a887bb
--- /dev/null
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="dynarr.c" />\r
+    <ClCompile Include="text.c" />\r
+    <ClCompile Include="treestore.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="dynarr.h" />\r
+    <ClInclude Include="treestore.h" />\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <VCProjectVersion>16.0</VCProjectVersion>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{f2e34635-b8e5-4c07-9652-c485ee884d3d}</ProjectGuid>\r
+    <RootNamespace>treestore</RootNamespace>\r
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <UseDebugLibraries>true</UseDebugLibraries>\r
+    <PlatformToolset>v143</PlatformToolset>\r
+    <CharacterSet>Unicode</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
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="Shared">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <LinkIncremental>true</LinkIncremental>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <LinkIncremental>false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>true</SDLCheck>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>Use</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories />\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <ClCompile>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <FunctionLevelLinking>true</FunctionLevelLinking>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <SDLCheck>false</SDLCheck>\r
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <ConformanceMode>true</ConformanceMode>\r
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeaderFile>\r
+      </PrecompiledHeaderFile>\r
+      <DisableSpecificWarnings>4996;4244;4267</DisableSpecificWarnings>\r
+      <AdditionalIncludeDirectories />\r
+    </ClCompile>\r
+    <Link>\r
+      <SubSystem>\r
+      </SubSystem>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file
diff --git a/libs/treestore/treestore.vcxproj.filters b/libs/treestore/treestore.vcxproj.filters
new file mode 100644 (file)
index 0000000..caf3c5a
--- /dev/null
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <Filter Include="Source Files">\r
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
+    </Filter>\r
+    <Filter Include="Header Files">\r
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>\r
+    </Filter>\r
+    <Filter Include="Resource Files">\r
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
+    </Filter>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="dynarr.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="text.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="treestore.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="dynarr.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="treestore.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
index 78b5591..13b2e05 100644 (file)
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "opengl.h"
 
 int init_opengl(void)
@@ -5,5 +6,10 @@ int init_opengl(void)
 #ifdef __glew_h__
        glewInit();
 #endif
+
+       printf("GL vendor: %s\n", glGetString(GL_VENDOR));
+       printf("GL renderer: %s\n", glGetString(GL_RENDERER));
+       printf("GL version: %s\n", glGetString(GL_VERSION));
+
        return 0;
 }
diff --git a/src/pc/assfilepc.c b/src/pc/assfilepc.c
new file mode 100644 (file)
index 0000000..6041dc3
--- /dev/null
@@ -0,0 +1,28 @@
+#include <stdio.h>
+#include "assfile.h"
+
+ass_file *ass_fopen(const char *fname, const char *mode)
+{
+       return (ass_file*)fopen(fname, mode);
+}
+
+void ass_fclose(ass_file *fp)
+{
+       fclose((FILE*)fp);
+}
+
+long ass_fseek(ass_file *fp, long offs, int whence)
+{
+       fseek((FILE*)fp, offs, whence);
+       return ftell((FILE*)fp);
+}
+
+long ass_ftell(ass_file *fp)
+{
+       return ftell((FILE*)fp);
+}
+
+size_t ass_fread(void *buf, size_t size, size_t count, ass_file *fp)
+{
+       return fread(buf, size, count, (FILE*)fp);
+}
diff --git a/src/pc/assman.c b/src/pc/assman.c
deleted file mode 100644 (file)
index 6041dc3..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-#include "assfile.h"
-
-ass_file *ass_fopen(const char *fname, const char *mode)
-{
-       return (ass_file*)fopen(fname, mode);
-}
-
-void ass_fclose(ass_file *fp)
-{
-       fclose((FILE*)fp);
-}
-
-long ass_fseek(ass_file *fp, long offs, int whence)
-{
-       fseek((FILE*)fp, offs, whence);
-       return ftell((FILE*)fp);
-}
-
-long ass_ftell(ass_file *fp)
-{
-       return ftell((FILE*)fp);
-}
-
-size_t ass_fread(void *buf, size_t size, size_t count, ass_file *fp)
-{
-       return fread(buf, size, count, (FILE*)fp);
-}
index 4f77408..1919b64 100644 (file)
@@ -49,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;
@@ -1525,7 +1525,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;
index 69b8f53..3633a3f 100644 (file)
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(__WATCOMC__) || defined(WIN32)
+#if defined(__WATCOMC__) || defined(_WIN32)
 #include <malloc.h>
 #else
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__)