- Various clang reformat

- Added shader compiler app (doing nothing) - Various Project files changes
2025-03-01 11:01:42 -05:00
parent 7c8f8a3bb1
commit 67528aaee1
19 changed files with 218 additions and 173 deletions
--- a/JulietApp/JulietApp.vcxproj
+++ b/JulietApp/JulietApp.vcxproj
@@ -11,69 +11,73 @@
        </ProjectConfiguration>
    </ItemGroup>
    <ItemGroup>
+        <ProjectReference Include="..\Game\Game.vcxproj">
+          <Project>{b7b12dcc-1a69-4371-a9fe-d6e7671497b0}</Project>
+          <Name>Game</Name>
+        </ProjectReference>
        <ProjectReference Include="..\Juliet\Juliet.vcxproj">
            <Project>{1bbc0b92-e4d8-4838-974b-439c5c501e82}</Project>
            <Name>Juliet</Name>
        </ProjectReference>
    </ItemGroup>
    <ItemGroup>
-      <ClInclude Include="main.h" />
+        <ClInclude Include="main.h"/>
    </ItemGroup>
    <ItemGroup>
-      <ClCompile Include="main.cpp">
-        <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
-        <Optimization>Disabled</Optimization>
-        <SupportJustMyCode>true</SupportJustMyCode>
-        <AssemblerOutput>NoListing</AssemblerOutput>
-        <AssemblerListingLocation>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</AssemblerListingLocation>
-        <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-        <BrowseInformationFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</BrowseInformationFile>
-        <CompileAs>Default</CompileAs>
-        <ConformanceMode>Default</ConformanceMode>
-        <DiagnosticsFormat>Column</DiagnosticsFormat>
-        <ExceptionHandling>false</ExceptionHandling>
-        <EnableASAN>false</EnableASAN>
-        <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-        <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-        <FloatingPointModel>Fast</FloatingPointModel>
-        <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-        <IntrinsicFunctions>false</IntrinsicFunctions>
-        <LanguageStandard>stdcpp20</LanguageStandard>
-        <LanguageStandard_C>Default</LanguageStandard_C>
-        <ModuleDependenciesFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</ModuleDependenciesFile>
-        <OmitDefaultLibName>false</OmitDefaultLibName>
-        <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-        <ObjectFileName>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</ObjectFileName>
-        <CallingConvention>Cdecl</CallingConvention>
-        <PrecompiledHeader>NotUsing</PrecompiledHeader>
-        <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-        <PrecompiledHeaderOutputFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\JulietApp.pch</PrecompiledHeaderOutputFile>
-        <PreprocessToFile>false</PreprocessToFile>
-        <PreprocessKeepComments>false</PreprocessKeepComments>
-        <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-        <ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
-        <ShowIncludes>false</ShowIncludes>
-        <SourceDependenciesFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</SourceDependenciesFile>
-        <SuppressStartupBanner>true</SuppressStartupBanner>
-        <BufferSecurityCheck>true</BufferSecurityCheck>
-        <SmallerTypeCheck>false</SmallerTypeCheck>
-        <StructMemberAlignment>Default</StructMemberAlignment>
-        <TrackerLogDirectory>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\JulietApp.tlog\</TrackerLogDirectory>
-        <MinimalRebuildFromTracking>true</MinimalRebuildFromTracking>
-        <TreatWarningAsError>false</TreatWarningAsError>
-        <WarningLevel>Level3</WarningLevel>
-        <XMLDocumentationFileName>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</XMLDocumentationFileName>
-        <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-        <IntelJCCErratum>false</IntelJCCErratum>
-        <BuildStlModules>false</BuildStlModules>
-        <TreatExternalTemplatesAsInternal>true</TreatExternalTemplatesAsInternal>
-        <PreprocessorDefinitions>_DEBUG;JULIET_WIN32;_UNICODE;UNICODE;</PreprocessorDefinitions>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-        <LinkCompiled>true</LinkCompiled>
-        <ClangClMode>true</ClangClMode>
-        <MSCVersion>Default</MSCVersion>
-        <AdditionalOptions>--target=amd64-pc-windows-msvc  </AdditionalOptions>
-      </ClCompile>
+        <ClCompile Include="main.cpp">
+            <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
+            <Optimization>Disabled</Optimization>
+            <SupportJustMyCode>true</SupportJustMyCode>
+            <AssemblerOutput>NoListing</AssemblerOutput>
+            <AssemblerListingLocation>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</AssemblerListingLocation>
+            <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
+            <BrowseInformationFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</BrowseInformationFile>
+            <CompileAs>Default</CompileAs>
+            <ConformanceMode>Default</ConformanceMode>
+            <DiagnosticsFormat>Column</DiagnosticsFormat>
+            <ExceptionHandling>false</ExceptionHandling>
+            <EnableASAN>false</EnableASAN>
+            <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+            <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+            <FloatingPointModel>Fast</FloatingPointModel>
+            <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+            <IntrinsicFunctions>false</IntrinsicFunctions>
+            <LanguageStandard>stdcpp20</LanguageStandard>
+            <LanguageStandard_C>Default</LanguageStandard_C>
+            <ModuleDependenciesFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</ModuleDependenciesFile>
+            <OmitDefaultLibName>false</OmitDefaultLibName>
+            <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+            <ObjectFileName>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</ObjectFileName>
+            <CallingConvention>Cdecl</CallingConvention>
+            <PrecompiledHeader>NotUsing</PrecompiledHeader>
+            <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
+            <PrecompiledHeaderOutputFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\JulietApp.pch</PrecompiledHeaderOutputFile>
+            <PreprocessToFile>false</PreprocessToFile>
+            <PreprocessKeepComments>false</PreprocessKeepComments>
+            <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+            <ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
+            <ShowIncludes>false</ShowIncludes>
+            <SourceDependenciesFile>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</SourceDependenciesFile>
+            <SuppressStartupBanner>true</SuppressStartupBanner>
+            <BufferSecurityCheck>true</BufferSecurityCheck>
+            <SmallerTypeCheck>false</SmallerTypeCheck>
+            <StructMemberAlignment>Default</StructMemberAlignment>
+            <TrackerLogDirectory>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\JulietApp.tlog\</TrackerLogDirectory>
+            <MinimalRebuildFromTracking>true</MinimalRebuildFromTracking>
+            <TreatWarningAsError>false</TreatWarningAsError>
+            <WarningLevel>Level3</WarningLevel>
+            <XMLDocumentationFileName>W:\Classified\Juliet\Intermediate\JulietApp\x64\Debug\</XMLDocumentationFileName>
+            <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+            <IntelJCCErratum>false</IntelJCCErratum>
+            <BuildStlModules>false</BuildStlModules>
+            <TreatExternalTemplatesAsInternal>true</TreatExternalTemplatesAsInternal>
+            <PreprocessorDefinitions>_DEBUG;JULIET_WIN32;_UNICODE;UNICODE;</PreprocessorDefinitions>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+            <LinkCompiled>true</LinkCompiled>
+            <ClangClMode>true</ClangClMode>
+            <MSCVersion>Default</MSCVersion>
+            <AdditionalOptions>--target=amd64-pc-windows-msvc</AdditionalOptions>
+        </ClCompile>
    </ItemGroup>
    <PropertyGroup Label="Globals">
        <VCProjectVersion>17.0</VCProjectVersion>
@@ -111,12 +115,8 @@
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
        <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
        <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
-        <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)JulietApp;$(IncludePath)</IncludePath>
-        <LibraryPath>$(SolutionDir)\bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <IncludePath>$(SolutionDir)Juliet\include\;$(SolutionDir)JulietApp;$(IncludePath)</IncludePath>
-        <LibraryPath>$(SolutionDir)\bin\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
        <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
        <IntDir>$(SolutionDir)Intermediate\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
    </PropertyGroup>
@@ -130,11 +130,13 @@
            <ExceptionHandling>false</ExceptionHandling>
            <FloatingPointModel>Fast</FloatingPointModel>
            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+            <AdditionalIncludeDirectories>$(SolutionDir)Juliet\include\;$(SolutionDir)JulietApp;$(IncludePath)</AdditionalIncludeDirectories>
        </ClCompile>
        <Link>
            <SubSystem>Console</SubSystem>
            <GenerateDebugInformation>true</GenerateDebugInformation>
            <AdditionalDependencies>Juliet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+            <AdditionalLibraryDirectories>$(SolutionDir)\lib\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
        </Link>
        <PreBuildEvent>
            <Command></Command>
@@ -152,6 +154,7 @@
            <ExceptionHandling>false</ExceptionHandling>
            <FloatingPointModel>Fast</FloatingPointModel>
            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+            <AdditionalIncludeDirectories>$(SolutionDir)Juliet\include\;$(SolutionDir)JulietApp;$(IncludePath)</AdditionalIncludeDirectories>
        </ClCompile>
        <Link>
            <SubSystem>Console</SubSystem>
@@ -159,6 +162,7 @@
            <OptimizeReferences>true</OptimizeReferences>
            <GenerateDebugInformation>true</GenerateDebugInformation>
            <AdditionalDependencies>Juliet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+            <AdditionalLibraryDirectories>$(SolutionDir)\lib\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
        </Link>
    </ItemDefinitionGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
--- a/JulietApp/main.cpp
+++ b/JulietApp/main.cpp
@@ -58,12 +58,12 @@ void JulietApplication::Init()
    if (Running)
    {
        AttachToWindow(GraphicsDevice, MainWindow);
-        //Game = LoadDynamicLibrary("Game.dll");
+        // Game = LoadDynamicLibrary("Game.dll");

        GameCode.Functions     = reinterpret_cast<void**>(&Game);
        GameCode.FunctionCount = ArraySize(GameFunctionTable);
        GameCode.FunctionNames = GameFunctionTable;
-        InitHotReloadCode(GameCode, StringBufferParam("Game.dll"),StringBufferParam("Game_Temp.dll"), StringBufferParam("lock.tmp"));
+        InitHotReloadCode(GameCode, StringBufferParam("Game.dll"), StringBufferParam("Game_Temp.dll"), StringBufferParam("lock.tmp"));
        if ((Running = GameCode.IsValid))
        {
            Game.Init();