FX11 is now fully compile time optional

diff --git a/od-win32/FX11/EffectAPI.cpp b/od-win32/FX11/EffectAPI.cpp
index 5fd561a5bd4a00601111162da0294deb206f6fb1..6d40dbdb6883187df26554956761df10443c0139 100644 (file)
--- a/od-win32/FX11/EffectAPI.cpp
+++ b/od-win32/FX11/EffectAPI.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: EffectAPI.cpp
 //
@@ -318,3 +320,5 @@ lExit:
     }
     return hr;
 }
+
+#endif

diff --git a/od-win32/FX11/EffectLoad.cpp b/od-win32/FX11/EffectLoad.cpp
index 0637eeefbf547d93da2ae3cdd9a6d688edda50ba..8a1d486fa7cd8a915bc50655563e66d8412a447e 100644 (file)
--- a/od-win32/FX11/EffectLoad.cpp
+++ b/od-win32/FX11/EffectLoad.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: EffectLoad.cpp
 //
@@ -4028,3 +4030,5 @@ lExit:
 #pragma warning(pop)
 
 }
+
+#endif

diff --git a/od-win32/FX11/EffectNonRuntime.cpp b/od-win32/FX11/EffectNonRuntime.cpp
index c2b2014c51b9d2f8627e0d98765b53f9de34dd01..43487226497a16470746d91e0eacb20824bcaf6a 100644 (file)
--- a/od-win32/FX11/EffectNonRuntime.cpp
+++ b/od-win32/FX11/EffectNonRuntime.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: EffectNonRuntime.cpp
 //
@@ -2986,3 +2988,5 @@ HRESULT PlacementNewVariable(_In_ void *pVar, _In_ SType *pType, _In_ bool IsAnn
 }
 
 }
+
+#endif

diff --git a/od-win32/FX11/EffectReflection.cpp b/od-win32/FX11/EffectReflection.cpp
index b4207e0a82b6c656a96dd65904a9293b6ff259c1..c1c4b20c906c33b5ab6a59b99873a3a218bf8262 100644 (file)
--- a/od-win32/FX11/EffectReflection.cpp
+++ b/od-win32/FX11/EffectReflection.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: EffectReflection.cpp
 //
@@ -2178,3 +2180,5 @@ ID3DX11EffectGroup * CEffect::GetGroupByName(_In_z_ LPCSTR Name)
 }
 
 }
+
+#endif

diff --git a/od-win32/FX11/EffectRuntime.cpp b/od-win32/FX11/EffectRuntime.cpp
index 4ef83e5455c2163aaaf57a14056d7dbec76a2696..9a22403f9d52e9f648ea48ee67184eb152231eb5 100644 (file)
--- a/od-win32/FX11/EffectRuntime.cpp
+++ b/od-win32/FX11/EffectRuntime.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: EffectRuntime.cpp
 //
@@ -716,3 +718,5 @@ void CEffect::HandleLocalTimerRollover()
 }
 
 }
+
+#endif

diff --git a/od-win32/FX11/d3dxGlobal.cpp b/od-win32/FX11/d3dxGlobal.cpp
index 366f697114d7d507e80bd59d886ed1183571afe2..0ff2f345a36a4043bbe982621823ca5bbd78211f 100644 (file)
--- a/od-win32/FX11/d3dxGlobal.cpp
+++ b/od-win32/FX11/d3dxGlobal.cpp
@@ -1,3 +1,5 @@
+#ifdef FX11
+
 //--------------------------------------------------------------------------------------
 // File: d3dxGlobal.cpp
 //
@@ -401,3 +403,5 @@ void __cdecl D3DXDebugPrintf(UINT lvl, LPCSTR szFormat, ...)
     OutputDebugStringA(strB);
 }
 #endif // _DEBUG
+
+#endif
\ No newline at end of file

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 31045b2ec8c60b10d602d606151d1de94b28e439..d3335c131c17f46a15d317f43448239a3e31de19 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -2,8 +2,6 @@
 #include <windows.h>
 #include "resource.h"
 
-#define FX11 1
-
 #include <DXGI1_5.h>
 #include <dxgi1_6.h>
 #include <d3d11.h>
@@ -967,7 +965,7 @@ static void fxremoveline(char *s, char *dst, const char **lines)
        *d = 0;
 }
 
-#if FX11
+#ifdef FX11
 
 static bool psEffect_LoadEffect(struct d3d11struct *d3d, const TCHAR *shaderfile, struct shaderdata11 *s, int num)
 {

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index 9477f5f123e29168a44e494f4b8e56fcc6c64555..e964278573b1708162c38789633ecad8e0301ea6 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -234,7 +234,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -401,7 +401,7 @@
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -714,7 +714,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -795,7 +795,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;__amd64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;__amd64__;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>