use d3dcompiler_46 now

R2NorthstarCN · Oct 14, 2023 · 047bca5 · 047bca5
1 parent eccbb66
commit 047bca5
Show file tree

Hide file tree

Showing 12 changed files with 543 additions and 37 deletions.
diff --git a/NorthstarDLL/client/imgui.cpp b/NorthstarDLL/client/imgui.cpp
@@ -1,5 +1,3 @@
-#ifndef NORTHSTAR_DEDICATED_ONLY
-
 #include "imgui.h"
 #include "core/memalloc.h"
 #include "imgui/implot.h"
@@ -157,5 +155,3 @@ void imgui_setup()
 	std::jthread setup_thread(setup_thread_func);
 	setup_thread.detach();
 }
-
-#endif
diff --git a/NorthstarDLL/client/imgui.h b/NorthstarDLL/client/imgui.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#ifndef NORTHSTAR_DEDICATED_ONLY
-
 #include <d3d11.h>
 
 #include "imgui/kiero.h"
@@ -37,5 +35,3 @@ extern std::vector<imgui_draw*> draw_functions;
 void imgui_setup();
 
 void imgui_add_draw(imgui_draw* func);
-
-#endif
diff --git a/NorthstarDLL/client/kcpstats.cpp b/NorthstarDLL/client/kcpstats.cpp
@@ -1,5 +1,3 @@
-#ifndef NORTHSTAR_DEDICATED_ONLY
-
 #include "kcpstats.h"
 #include "client/imgui.h"
 #include "imgui/implot.h"
@@ -492,5 +490,3 @@ std::vector<double> modified_sinc_smoother::smooth_except_boudaries(std::vector<
 	}
 	return smoothed;
 }
-
-#endif
diff --git a/NorthstarDLL/client/kcpstats.h b/NorthstarDLL/client/kcpstats.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#ifndef NORTHSTAR_DEDICATED_ONLY
-
 extern ConVar* Cvar_kcp_stats;
 extern ConVar* Cvar_kcp_stats_interval;
 
@@ -83,5 +81,3 @@ struct sliding_window
 	double max();
 	double min();
 };
-
-#endif
diff --git a/NorthstarDLL/dllmain.cpp b/NorthstarDLL/dllmain.cpp
@@ -170,9 +170,7 @@ bool InitialiseNorthstar()
 	// run callbacks for any libraries that are already loaded by now
 	CallAllPendingDLLLoadCallbacks();
 
-	#ifndef NORTHSTAR_DEDICATED_ONLY
 	imgui_setup();
-	#endif
 
 	return true;
 }
diff --git a/R2Northstar.sln b/R2Northstar.sln
@@ -14,8 +14,6 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Dedicated|x64 = Dedicated|x64
-		Dedicated|x86 = Dedicated|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
@@ -24,10 +22,6 @@ Global
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Debug|x64.Build.0 = Debug|x64
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Debug|x86.ActiveCfg = Debug|x64
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Debug|x86.Build.0 = Debug|x64
-		{CFAD2623-064F-453C-8196-79EE10292E32}.Dedicated|x64.ActiveCfg = Dedicated|x64
-		{CFAD2623-064F-453C-8196-79EE10292E32}.Dedicated|x64.Build.0 = Dedicated|x64
-		{CFAD2623-064F-453C-8196-79EE10292E32}.Dedicated|x86.ActiveCfg = Dedicated|x64
-		{CFAD2623-064F-453C-8196-79EE10292E32}.Dedicated|x86.Build.0 = Dedicated|x64
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Release|x64.ActiveCfg = Release|x64
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Release|x64.Build.0 = Release|x64
 		{CFAD2623-064F-453C-8196-79EE10292E32}.Release|x86.ActiveCfg = Release|x64
@@ -36,10 +30,6 @@ Global
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Debug|x64.Build.0 = Debug|x64
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Debug|x86.ActiveCfg = Debug|x64
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Debug|x86.Build.0 = Debug|x64
-		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Dedicated|x64.ActiveCfg = Dedicated|x64
-		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Dedicated|x64.Build.0 = Dedicated|x64
-		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Dedicated|x86.ActiveCfg = Dedicated|x64
-		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Dedicated|x86.Build.0 = Dedicated|x64
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Release|x64.ActiveCfg = Release|x64
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Release|x64.Build.0 = Release|x64
 		{0EA82CB0-53FE-4D4C-96DF-47FA970513D0}.Release|x86.ActiveCfg = Release|x64
@@ -48,10 +38,6 @@ Global
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Debug|x64.Build.0 = Debug|x64
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Debug|x86.ActiveCfg = Debug|x64
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Debug|x86.Build.0 = Debug|x64
-		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Dedicated|x64.ActiveCfg = Dedicated|x64
-		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Dedicated|x64.Build.0 = Dedicated|x64
-		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Dedicated|x86.ActiveCfg = Dedicated|x64
-		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Dedicated|x86.Build.0 = Dedicated|x64
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Release|x64.ActiveCfg = Release|x64
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Release|x64.Build.0 = Release|x64
 		{CF55F3B5-F348-450A-9CCB-C269F21D629D}.Release|x86.ActiveCfg = Release|x64
@@ -60,10 +46,6 @@ Global
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Debug|x64.Build.0 = Debug|x64
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Debug|x86.ActiveCfg = Debug|Win32
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Debug|x86.Build.0 = Debug|Win32
-		{1570428B-1659-4B00-B95F-2C23C634B616}.Dedicated|x64.ActiveCfg = Dedicated|x64
-		{1570428B-1659-4B00-B95F-2C23C634B616}.Dedicated|x64.Build.0 = Dedicated|x64
-		{1570428B-1659-4B00-B95F-2C23C634B616}.Dedicated|x86.ActiveCfg = Dedicated|Win32
-		{1570428B-1659-4B00-B95F-2C23C634B616}.Dedicated|x86.Build.0 = Dedicated|Win32
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Release|x64.ActiveCfg = Release|x64
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Release|x64.Build.0 = Release|x64
 		{1570428B-1659-4B00-B95F-2C23C634B616}.Release|x86.ActiveCfg = Release|Win32