diff --git a/buildSrc/win.gradle b/buildSrc/win.gradle --- a/buildSrc/win.gradle +++ b/buildSrc/win.gradle @@ -80,7 +80,6 @@ defineProperty("WINDOWS_VS_DEVENVDIR", properties, "$WINDOWS_VS_VSINSTALLDIR/Common7/IDE") defineProperty("WINDOWS_VS_DEVENVCMD", properties, "$WINDOWS_VS_DEVENVDIR/VCExpress.exe") defineProperty("WINDOWS_VS_MSVCDIR", properties, WINDOWS_VS_VCINSTALLDIR) - defineProperty("WINDOWS_DXSDK_DIR", properties, System.getenv().get("DXSDK_DIR")) defineProperty("WINDOWS_VS_INCLUDE", properties, "$WINDOWS_VS_VCINSTALLDIR/INCLUDE;" + "$WINDOWS_SDK_DIR/include;") defineProperty("WINDOWS_VS_VER", properties, "70") defineProperty("WINDOWS_VS_LIB", properties, "$WINDOWS_VS_VCINSTALLDIR/LIB;" + "$WINDOWS_SDK_DIR/lib;") @@ -104,8 +103,7 @@ "PATH" : WINDOWS_VS_PATH, "INCLUDE" : WINDOWS_VS_INCLUDE, "LIB" : WINDOWS_VS_LIB, - "LIBPATH" : WINDOWS_VS_LIBPATH, - "DXSDK_DIR" : WINDOWS_DXSDK_DIR + "LIBPATH" : WINDOWS_VS_LIBPATH ]; String msvcBinDir = (IS_64 @@ -116,12 +114,13 @@ def winSdkBinDir="$WINDOWS_SDK_DIR/Bin/" + (IS_64 ? "x64" : "x86") ext.RC = cygpath("$winSdkBinDir/RC.Exe") def rcCompiler = RC -ext.FXC = cygpath("$WINDOWS_DXSDK_DIR/utilities/bin/x86/fxc.exe") +ext.FXC = cygpath("$winSdkBinDir/fxc.exe") ext.MC = cygpath("$winSdkBinDir/mt.exe") // This next line is based on a line in the ant build scripts, but doesn't seem to point to the right place //ext.MSVCR = cygpath("${WINDOWS_VS_MSVCDIR}/redist/${IS_64 ? 'x64' : 'x86'}/Microsoft.VC${WINDOWS_VS_VER}.CRT/msvcr${WINDOWS_VS_VER}.dll") if (!file(RC).exists()) throw new GradleException("FAIL: cannot find RC") +if (!file(FXC).exists()) throw new GradleException("FAIL: cannot find FXC") def rcFlags = [ "/d", "\"JFX_COMPANY=${COMPANY_NAME}\"",