Fix some compiler errors.

JPeterMugaas · Jul 1, 2024 · 2385c11 · 2385c11
1 parent 1c0f9ac
commit 2385c11
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 cmake_minimum_required (VERSION 3.21)
 
-set(EFXC2_VERSION 0.0.13.270)
+set(EFXC2_VERSION 0.0.13.272)
 project (efxc2 VERSION ${EFXC2_VERSION}
   DESCRIPTION "Enhanced fxc2"
   HOMEPAGE_URL "https://github.com/JPeterMugaas/efxc2"

diff --git a/efxc2.cpp b/efxc2.cpp
@@ -69,7 +69,7 @@ int main(int argc, char* argv[]) {
 				efxc2Cmds::cmd_D(params, temp);
 				continue;
 			}
-			else if (efxc2Utils::parseOpt(efxc2Cmds::M_E, args, &index, &temp)) {
+			else if (efxc2Utils::parseOpt(efxc2Cmds::M_E_, args, &index, &temp)) {
 				efxc2Cmds::cmd_E(params, temp);
 				continue;
 			}

diff --git a/efxc2Cmds.cpp b/efxc2Cmds.cpp
@@ -140,7 +140,7 @@ void efxc2Cmds::cmd_D(efxc2CompilerParams::CompilerParams& params, _In_ const ef
     std::string defineOption = { _defineOption.data(), _defineOption.size() };
 #endif
     params.add_define(defineOption);
-    print_string_parameter(params, M_D, M_FH_DESCR, defineOption);
+    print_string_parameter(params, M_D, M_FH_DESCR, _defineOption);
 }
 
 void efxc2Cmds::cmd_E(efxc2CompilerParams::CompilerParams& params, _In_ const efxc2Utils::M_STRING_VIEW _entryPoint) {
@@ -150,7 +150,7 @@ void efxc2Cmds::cmd_E(efxc2CompilerParams::CompilerParams& params, _In_ const ef
     std::string entryPoint = { _entryPoint.data(), _entryPoint.size() };
 #endif
     params.set_entryPoint(entryPoint);
-    print_string_parameter(params, M_E, M_E_DESCR, _entryPoint);
+    print_string_parameter(params, M_E_, M_E_DESCR, _entryPoint);
     return;
 }
 
@@ -418,7 +418,7 @@ void efxc2Cmds::cmd_Vn(efxc2CompilerParams::CompilerParams& params, _In_ const e
     std::string variableName = { _variableName.data(), _variableName.size() };
 #endif
     params.set_variableName(variableName);
-    print_string_parameter(params, M_VN, M_P_DESCR, variableName);
+    print_string_parameter(params, M_VN, M_P_DESCR, _variableName);
     return;
 }
 

diff --git a/efxc2Cmds.h b/efxc2Cmds.h
@@ -77,7 +77,8 @@ namespace efxc2Cmds {
 	constexpr const wchar_t* M_DEBUG = L"debug";
 	constexpr const wchar_t* M_DECOMPRESS = L"decompress";
 	constexpr const wchar_t* M_DUMPBIN = L"dumpbin";
-	constexpr const wchar_t* M_E = L"E";
+	/*This has to be M_E_ instead of M_E as that conflicts with a constant in math.h*/
+	constexpr const wchar_t* M_E_ = L"E";
 	constexpr const wchar_t* M_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES = L"enable_unbounded_descriptor_tables";
 	constexpr const wchar_t* M_FC = L"Fc";
 	constexpr const wchar_t* M_FD = L"Fd";