diff options
author | quou <quou@disroot.org> | 2024-12-28 18:47:46 +1100 |
---|---|---|
committer | quou <quou@disroot.org> | 2024-12-28 18:47:46 +1100 |
commit | d7a511e6a4cea46e1de05f868e7eb81ebdee7b80 (patch) | |
tree | 394344a3ad0aadd8dc0d2f97fe249e52de046e4f /msbuild | |
parent | e31535abfff4c3335dd465e3745a69d3102253a6 (diff) |
update the windows build
Diffstat (limited to 'msbuild')
-rw-r--r-- | msbuild/c2.sln | 20 | ||||
-rw-r--r-- | msbuild/c2.vcxproj | 5 | ||||
-rw-r--r-- | msbuild/c2.vcxproj.filters | 6 | ||||
-rw-r--r-- | msbuild/convmodel/convmodel.vcxproj | 171 | ||||
-rw-r--r-- | msbuild/convmodel/convmodel.vcxproj.filters | 27 | ||||
-rw-r--r-- | msbuild/models/models.vcxproj | 181 | ||||
-rw-r--r-- | msbuild/models/models.vcxproj.filters | 22 | ||||
-rw-r--r-- | msbuild/pack/pack.vcxproj | 37 | ||||
-rw-r--r-- | msbuild/shaders/shaders.vcxproj | 5 | ||||
-rw-r--r-- | msbuild/shaders/shaders.vcxproj.filters | 3 |
10 files changed, 461 insertions, 16 deletions
diff --git a/msbuild/c2.sln b/msbuild/c2.sln index 0d64859..d015c78 100644 --- a/msbuild/c2.sln +++ b/msbuild/c2.sln @@ -24,6 +24,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "packer", "packer\packer.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pack", "pack\pack.vcxproj", "{F1112477-5C76-4351-A4B4-7E6266274F23}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "convmodel", "convmodel\convmodel.vcxproj", "{F08DD850-EB6C-49C9-9F54-5EEB686AA971}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcxproj", "{B68E4313-0930-4E49-9D71-312727DAEF51}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -104,6 +108,22 @@ Global {F1112477-5C76-4351-A4B4-7E6266274F23}.Release|x64.Build.0 = Release|x64 {F1112477-5C76-4351-A4B4-7E6266274F23}.Release|x86.ActiveCfg = Release|Win32 {F1112477-5C76-4351-A4B4-7E6266274F23}.Release|x86.Build.0 = Release|Win32 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Debug|x64.ActiveCfg = Debug|x64 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Debug|x64.Build.0 = Debug|x64 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Debug|x86.ActiveCfg = Debug|Win32 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Debug|x86.Build.0 = Debug|Win32 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Release|x64.ActiveCfg = Release|x64 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Release|x64.Build.0 = Release|x64 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Release|x86.ActiveCfg = Release|Win32 + {F08DD850-EB6C-49C9-9F54-5EEB686AA971}.Release|x86.Build.0 = Release|Win32 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Debug|x64.ActiveCfg = Debug|x64 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Debug|x64.Build.0 = Debug|x64 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Debug|x86.ActiveCfg = Debug|Win32 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Debug|x86.Build.0 = Debug|Win32 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x64.ActiveCfg = Release|x64 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x64.Build.0 = Release|x64 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x86.ActiveCfg = Release|Win32 + {B68E4313-0930-4E49-9D71-312727DAEF51}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msbuild/c2.vcxproj b/msbuild/c2.vcxproj index ca74e7e..547a89e 100644 --- a/msbuild/c2.vcxproj +++ b/msbuild/c2.vcxproj @@ -163,6 +163,7 @@ <ClCompile Include="..\asset.cpp" /> <ClCompile Include="..\c2.cpp" /> <ClCompile Include="..\maths.cpp" /> + <ClCompile Include="..\model.cpp" /> <ClCompile Include="..\pipeline.cpp" /> <ClCompile Include="..\ui.cpp" /> <ClCompile Include="..\video.cpp" /> @@ -172,10 +173,14 @@ <ClInclude Include="..\asset.hpp" /> <ClInclude Include="..\glad_vk.h" /> <ClInclude Include="..\maths.hpp" /> + <ClInclude Include="..\model.hpp" /> <ClInclude Include="..\ui.hpp" /> <ClInclude Include="..\video.hpp" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="pack\pack.vcxproj"> + <Project>{f1112477-5c76-4351-a4b4-7e6266274f23}</Project> + </ProjectReference> <ProjectReference Include="qstd\qstd.vcxproj"> <Project>{1bb0efa0-f482-4d8c-adcc-946343d3fe02}</Project> </ProjectReference> diff --git a/msbuild/c2.vcxproj.filters b/msbuild/c2.vcxproj.filters index 0f942d6..f6038e5 100644 --- a/msbuild/c2.vcxproj.filters +++ b/msbuild/c2.vcxproj.filters @@ -36,6 +36,9 @@ <ClCompile Include="..\video.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\model.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\app.hpp"> @@ -56,5 +59,8 @@ <ClInclude Include="..\video.hpp"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\model.hpp"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/msbuild/convmodel/convmodel.vcxproj b/msbuild/convmodel/convmodel.vcxproj new file mode 100644 index 0000000..27aced6 --- /dev/null +++ b/msbuild/convmodel/convmodel.vcxproj @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>17.0</VCProjectVersion> + <Keyword>Win32Proj</Keyword> + <ProjectGuid>{f08dd850-eb6c-49c9-9f54-5eeb686aa971}</ProjectGuid> + <RootNamespace>convmodel</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)bin\$(ProjectName)\$(Configuration)\$(Platform)\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>qstd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\</AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>qstd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\</AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>qstd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\</AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>plat_win;plat_x86;allocation_default_alignment=8;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + <AdditionalIncludeDirectories>$(SolutionDir)..\qstd;$(SolutionDir)..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>qstd.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>$(SolutionDir)bin\qstd\$(Configuration)\$(Platform)\</AdditionalLibraryDirectories> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectReference Include="..\qstd\qstd.vcxproj"> + <Project>{1bb0efa0-f482-4d8c-adcc-946343d3fe02}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\cgltf.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\convmodel.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/msbuild/convmodel/convmodel.vcxproj.filters b/msbuild/convmodel/convmodel.vcxproj.filters new file mode 100644 index 0000000..0490406 --- /dev/null +++ b/msbuild/convmodel/convmodel.vcxproj.filters @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\convmodel.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\cgltf.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msbuild/models/models.vcxproj b/msbuild/models/models.vcxproj new file mode 100644 index 0000000..9937d06 --- /dev/null +++ b/msbuild/models/models.vcxproj @@ -0,0 +1,181 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <VCProjectVersion>17.0</VCProjectVersion> + <Keyword>Win32Proj</Keyword> + <ProjectGuid>{b68e4313-0930-4e49-9d71-312727daef51}</ProjectGuid> + <RootNamespace>models</RootNamespace> + <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Utility</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v143</PlatformToolset> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>$(SolutionDir)..\data\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>$(SolutionDir)..\data\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>$(SolutionDir)..\data\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>$(SolutionDir)..\data\</OutDir> + <IntDir>$(SolutionDir)obj\$(ProjectName)\$(Configuration)\$(Platform)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + <CustomBuild> + <Command>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Command> + <Message>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Message> + <Outputs>$(SolutionDir)..\data\%(Filename).mdl</Outputs> + </CustomBuild> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + <CustomBuild> + <Command>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Command> + <Message>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Message> + <Outputs>$(SolutionDir)..\data\%(Filename).mdl</Outputs> + </CustomBuild> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + <CustomBuild> + <Command>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Command> + <Message>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Message> + <Outputs>$(SolutionDir)..\data\%(Filename).mdl</Outputs> + </CustomBuild> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <SDLCheck>true</SDLCheck> + <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <ConformanceMode>true</ConformanceMode> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + <CustomBuild> + <Command>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Command> + <Message>$(SolutionDir)bin\convmodel\$(Configuration)\$(Platform)\convmodel.exe $(SolutionDir)..\data %(FullPath) $(SolutionDir)..\data\%(Filename).mdl</Message> + <Outputs>$(SolutionDir)..\data\%(Filename).mdl</Outputs> + </CustomBuild> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectReference Include="..\convmodel\convmodel.vcxproj"> + <Project>{f08dd850-eb6c-49c9-9f54-5eeb686aa971}</Project> + </ProjectReference> + <ProjectReference Include="..\shaders\shaders.vcxproj"> + <Project>{c3ef6e38-d98f-4341-8373-571253f405bd}</Project> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\intermediate\monkey.glb"> + <FileType>Document</FileType> + </CustomBuild> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/msbuild/models/models.vcxproj.filters b/msbuild/models/models.vcxproj.filters new file mode 100644 index 0000000..ac109f7 --- /dev/null +++ b/msbuild/models/models.vcxproj.filters @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\intermediate\monkey.glb"> + <Filter>Source Files</Filter> + </CustomBuild> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/msbuild/pack/pack.vcxproj b/msbuild/pack/pack.vcxproj index bb0c415..8d48efd 100644 --- a/msbuild/pack/pack.vcxproj +++ b/msbuild/pack/pack.vcxproj @@ -144,32 +144,37 @@ </ItemDefinitionGroup> <ItemGroup> <CustomBuild Include="thing.txt"> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;%(AdditionalInputs)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh -</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh</Message> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\data\22.tex;$(SolutionDir)..\data\kita.tex;$(SolutionDir)..\data\triangle.csh;$(SolutionDir)..\data\ui.csh;$(SolutionDir)..\data\surface.csh;$(SolutionDir)..\data\monkey.mdl;%(AdditionalInputs)</AdditionalInputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\pack</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh -</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\pack</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh -</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\pack</Outputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh -</Command> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\packer\$(Configuration)\$(Platform)\packer.exe $(SolutionDir)..\pack $(SolutionDir)..\data 22.tex kita.tex triangle.csh ui.csh surface.csh monkey.mdl</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\pack</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\models\models.vcxproj"> + <Project>{b68e4313-0930-4e49-9d71-312727daef51}</Project> + </ProjectReference> <ProjectReference Include="..\packer\packer.vcxproj"> <Project>{3987e63d-cb96-42eb-ba88-a3af3f640897}</Project> </ProjectReference> + <ProjectReference Include="..\shaders\shaders.vcxproj"> + <Project>{c3ef6e38-d98f-4341-8373-571253f405bd}</Project> + </ProjectReference> + <ProjectReference Include="..\textures\textures.vcxproj"> + <Project>{0e0e5a6a-51c0-494d-8816-932422ade2ba}</Project> + </ProjectReference> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/msbuild/shaders/shaders.vcxproj b/msbuild/shaders/shaders.vcxproj index 5b9e602..f5ed96b 100644 --- a/msbuild/shaders/shaders.vcxproj +++ b/msbuild/shaders/shaders.vcxproj @@ -199,6 +199,11 @@ <Project>{86c58ec1-51ed-4ec6-85a4-2fdf153dd92a}</Project> </ProjectReference> </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\intermediate\surface.glsl"> + <FileType>Document</FileType> + </CustomBuild> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> diff --git a/msbuild/shaders/shaders.vcxproj.filters b/msbuild/shaders/shaders.vcxproj.filters index 26396ea..3e82e32 100644 --- a/msbuild/shaders/shaders.vcxproj.filters +++ b/msbuild/shaders/shaders.vcxproj.filters @@ -21,5 +21,8 @@ <CustomBuild Include="..\..\intermediate\ui.glsl"> <Filter>Source Files</Filter> </CustomBuild> + <CustomBuild Include="..\..\intermediate\surface.glsl"> + <Filter>Source Files</Filter> + </CustomBuild> </ItemGroup> </Project>
\ No newline at end of file |