Merge pull request #139 from K-Society/experimental

Fix for Bebug mode.
K-Society · May 13, 2024 · 7762bc3 · 7762bc3
2 parents b8c62d2 + 0f1cbac
commit 7762bc3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/01/Programmer/Programmer.vcxproj b/src/01/Programmer/Programmer.vcxproj
@@ -101,7 +101,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalLibraryDirectories>$(SolutionDir)Programmer\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>CubeProgrammer_API.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vcruntimed.lib;ucrtd.lib;CubeProgrammer_API.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers />
     </Link>
     <ProjectReference>
@@ -149,13 +149,14 @@
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <IntrinsicFunctions />
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalLibraryDirectories>$(SolutionDir)Programmer\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>CubeProgrammer_API.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>vcruntimed.lib;ucrtd.lib;CubeProgrammer_API.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>
       </DelayLoadDLLs>
     </Link>
@@ -225,4 +226,4 @@
     <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.6.133\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.6.133\build\Nerdbank.GitVersioning.targets'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
   </Target>
-</Project>
+</Project>
diff --git a/src/01/Programmer/dllmain.cpp b/src/01/Programmer/dllmain.cpp
@@ -21,6 +21,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
             if (size > 0)
             {
                 std::wstring dllNameStr(dllName);
+
                 std::size_t pos = dllNameStr.size() - 14;
                 dllNameStr = dllNameStr.substr(0, pos);
                 dllNameStr += loaderPath;

diff --git a/src/01/Programmer/framework.h b/src/01/Programmer/framework.h
@@ -3,7 +3,3 @@
 #define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
 // Windows Header Files
 #include <windows.h>
-#include <tchar.h>
-#include <stdio.h>
-#include <string>
-#include <algorithm>
diff --git a/src/01/Programmer/pch.h b/src/01/Programmer/pch.h
@@ -10,5 +10,9 @@
 // add headers that you want to pre-compile here
 #include "framework.h"
 #include "Programmer.h"
+#include <string>
+#include <tchar.h>
+#include <stdio.h>
+#include <algorithm>
 
 #endif //PCH_H