diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 3bb3af3..6af00dc 100644
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -996,8 +996,10 @@
         shader->setNanMinMaxClamp(NaNClamp);
         shader->setResourceSetBinding(baseResourceSetBinding[compUnit.stage]);
 
+#ifdef ENABLE_HLSL
         if (Options & EOptionHlslIoMapping)
             shader->setHlslIoMapping(true);
+#endif
 
         if (Options & EOptionAutoMapBindings)
             shader->setAutoMapBindings(true);
@@ -1023,8 +1025,10 @@
                                 compUnit.stage, Client, ClientInputSemanticsVersion);
             shader->setEnvClient(Client, ClientVersion);
             shader->setEnvTarget(TargetLanguage, TargetVersion);
+#ifdef ENABLE_HLSL
             if (targetHlslFunctionality1)
                 shader->setEnvTargetHlslFunctionality1();
+#endif
         }
 
         shaders.push_back(shader);