1.2.0.beta.11.2.0.beta.1

2 files changed, 190 insertions, 24 deletions

diff --git a/extensions/compiler/xpj/flexExtCUDA.xpj b/extensions/compiler/xpj/flexExtCUDA.xpj
index 434b2fe..6e80a6f 100644
--- a/extensions/compiler/xpj/flexExtCUDA.xpj
+++ b/extensions/compiler/xpj/flexExtCUDA.xpj
@@ -12,7 +12,7 @@
 		</Conditional>
 
 		<Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export>
-		<Export platform="android{x}" tool="make">../makeandroid</Export>
+		<Export platform="android_aarch64" tool="make">../makeandroid_aarch64</Export>
 		<Export platform="Linux64" tool="make">../makelinux64</Export>
 
 		<Target name="flexExtCUDA">
@@ -118,47 +118,43 @@
 
 			</Config>
 
-			<!-- Android -->
+			<!-- Android aarch64-->
 
-			<Config name="default" type="lib" platforms="android{x}">
+			<Config name="default" type="lib" platforms="android_aarch64">
 
-				<apply-template name="android-common"/>
+				<apply-template name="android-aarch64-common"/>
 
 				<FileTemplate name="cuda" command='${user:NVCC} ${user:NVCCInclude} --compile "%s" -o "%o"' buildtype="CustomBuild" />
 
-				<OutDir platforms="android{x}" tool="make">${user:ProjectRoot}/lib/android</OutDir>
+				<OutDir platforms="android_aarch64" tool="make">${user:ProjectRoot}/lib/android_aarch64</OutDir>
 
-				<Preprocessor type="define" platform="android{x}">
-					android 
+				<Preprocessor type="define" platform="android_aarch64">
+					android
 					ANDROID=1
 					ANDROID_PLAT=1
 					DISABLE_IMPORTGL
 				</Preprocessor>
 
-				<CFlags tool="make">
-					-Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-				</CFlags>
-
+				<CFlags tool="make">-Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions</CFlags>
+				
 			</Config>
 
-			<Config name="release" type="lib" platforms="android{x}">
+			<Config name="release" type="lib" platforms="android_aarch64">
 				<cflags> -O3 -ffast-math </cflags>
-				<OutFile>libflexExt_cuda_release_armv7l.a</OutFile>
-
+				<OutFile>libNvFlexExtReleaseCUDA_aarch64.a</OutFile>
+				
 				<Libraries>
-					${user:ProjectRoot}/lib/android/libNvFlexRelease_armv7l.a
-				</Libraries>
-
+					${user:ProjectRoot}/lib/android_aarch64/libNvFlexRelease_aarch64.a
+				</Libraries>				
 			</Config>
 
-			<Config name="debug" type="lib" platforms="android{x}">
+			<Config name="debug" type="lib" platforms="android_aarch64">
 				<cflags> -g -O0 </cflags>
-				<OutFile>libflexExt_cuda_debug_armv7l.a</OutFile>
-
+				<OutFile>libNvFlexExtDebugCUDA_aarch64.a</OutFile>
+				
 				<Libraries>
-					${user:ProjectRoot}/lib/android/libNvFlexDebug_armv7l.a
-				</Libraries>
-
+					${user:ProjectRoot}/lib/android_aarch64/libNvFlexDebug_aarch64.a
+				</Libraries>				
 			</Config>
 
 
@@ -236,4 +232,4 @@
 		</Target>
 	</Project>
 
-</XPJ>
\ No newline at end of file
+</XPJ>
diff --git a/extensions/compiler/xpj/flexExtD3D12.xpj b/extensions/compiler/xpj/flexExtD3D12.xpj
new file mode 100644
index 0000000..7ba5bd8
--- /dev/null
+++ b/extensions/compiler/xpj/flexExtD3D12.xpj
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<XPJ version="4">
+
+  <Project name="flexExtD3D12">
+
+    <!-- depends on flex solver project -->
+    <Conditional value="${config}" match="internal">
+      <Import file="../../../src/compiler/xpj/flexD3D12.xpj" />
+    </Conditional>
+
+    <Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export>
+
+    <Target name="flexExtD3D12">
+
+      <Var name="ProjectRoot" value="../../.." />
+
+      <!-- Windows -->
+
+      <Config name="default" type="dll" platforms="Win32 Win64">
+
+        <OutDir platform="Win32">../../../bin/win32/</OutDir>
+        <OutDir platform="Win64">../../../bin/win64/</OutDir>
+
+        <Preprocessor type="define">
+          _CONSOLE
+          WIN32
+        </Preprocessor>
+
+        <WarningLevel>3</WarningLevel>
+        <GenerateDebugInformation>true</GenerateDebugInformation>
+        <CharacterSet>MultiByte</CharacterSet>
+
+        <SearchPaths type="header">
+          ..\..\..\..\..
+        </SearchPaths>
+
+        <Libraries>
+          kernel32.lib
+          user32.lib
+          gdi32.lib
+          winspool.lib
+          comdlg32.lib
+          advapi32.lib
+          shell32.lib
+          ole32.lib
+          oleaut32.lib
+          uuid.lib
+          odbc32.lib
+          odbccp32.lib
+        </Libraries>
+
+      </Config>
+
+      <Config name="debug" type="dll" platforms="Win32 Win64">
+
+        <OutFile platform="Win32">flexExt_d3d12_debug_x86.dll</OutFile>
+        <OutFile platform="Win64">flexExt_d3d12_debug_x64.dll</OutFile>
+
+        <IntDir>./build/${xpj:PLATFORM}/DX/debug/</IntDir>
+
+        <Preprocessor type="define">
+          _DEBUG
+        </Preprocessor>
+        <Preprocessor type="define">
+          _ITERATOR_DEBUG_LEVEL=0
+        </Preprocessor>
+        <RuntimeLibrary>MTd</RuntimeLibrary>
+        <GenerateDebugInformation>true</GenerateDebugInformation>
+        <FloatingPointModel>Precise</FloatingPointModel>
+        <ExportLibrary platform="Win32">..\..\..\lib\win32\flexExt_d3d12_debug_x86.lib</ExportLibrary>
+        <ExportLibrary platform="Win64">..\..\..\lib\win64\flexExt_d3d12_debug_x64.lib</ExportLibrary>
+
+        <Libraries platforms="Win32">
+          ${user:ProjectRoot}/lib/win32/flex_d3d12_debug_x86.lib
+        </Libraries>
+
+        <Libraries platforms="Win64">
+          ${user:ProjectRoot}/lib/win64/flex_d3d12_debug_x64.lib
+        </Libraries>
+
+      </Config>
+
+      <Config name="release" type="dll" platforms="Win32 Win64">
+
+        <OutFile platform="Win32">flexExt_d3d12_release_x86.dll</OutFile>
+        <OutFile platform="Win64">flexExt_d3d12_release_x64.dll</OutFile>
+
+        <IntDir>./build/${xpj:PLATFORM}/DX/release/</IntDir>
+
+        <Preprocessor type="define">
+          NDEBUG
+        </Preprocessor>
+        <RuntimeLibrary>MT</RuntimeLibrary>
+        <WholeProgramOptimization>1</WholeProgramOptimization>
+        <Optimization>3</Optimization>
+        <EnableIntrinsicFunctions>true</EnableIntrinsicFunctions>
+        <BufferSecurityCheck>false</BufferSecurityCheck>
+        <EnableFunctionLevelLinking>true</EnableFunctionLevelLinking>
+        <FloatingPointModel>Fast</FloatingPointModel>
+
+        <ExportLibrary platform="Win32">..\..\..\lib\win32\flexExt_d3d12_release_x86.lib</ExportLibrary>
+        <ExportLibrary platform="Win64">..\..\..\lib\win64\flexExt_d3d12_release_x64.lib</ExportLibrary>
+
+        <Libraries platforms="Win32">
+          ${user:ProjectRoot}/lib/win32/flex_d3d12_release_x86.lib
+        </Libraries>
+
+        <Libraries platforms="Win64">
+          ${user:ProjectRoot}/lib/win64/flex_d3d12_release_x64.lib
+        </Libraries>
+
+      </Config>
+
+
+      <SearchPaths type="header">
+        ..\..\..\
+        ..\..\..\external\D3D12\include
+      </SearchPaths>
+
+      <SearchPaths type="lib" platform="Win32">
+        ..\..\..\external\D3D12\libs\x86
+        ..\..\..\lib\x86
+      </SearchPaths>
+
+      <SearchPaths type="lib" platform="Win64">
+        ..\..\..\external\D3D12\libs\x64
+        ..\..\..\lib\win64
+      </SearchPaths>      
+      
+      <!-- Source -->
+
+      <Files name="Core" type="source" root="${user:ProjectRoot}/core">
+        sdf.cpp
+        voxelize.cpp
+        maths.cpp
+        aabbtree.cpp
+      </Files>
+
+      <Files name="src" type="source" root="${user:ProjectRoot}/extensions/dx">
+        flexExt.cpp
+        flexExt.hlsl
+        flexExt_dx_common.h
+      </Files>
+
+      <Files name="src" type="source" root="${user:ProjectRoot}/include">
+        flexExt.h
+      </Files>
+
+      <Files name="src" type="source" root="${user:ProjectRoot}/extensions">
+        flexExtCloth.cpp
+        flexExtRigid.cpp
+        flexExtSoft.cpp
+        flexExtMovingFrame.cpp
+        flexExtContainer.cpp
+      </Files>
+
+      <HLSL Configurations="release" DisableOptim="No" Debug="No" ShaderModel="5.0" Platforms="Win32 Win64" ObjectFileOutput=" " WarningAsErrors="false" OutputHeaderFileName="${user:ProjectRoot}/extensions/dx/shaders/%(Filename).h">
+        <File  ShaderType="Compute" EntryPoint="UpdateForceFields::execute" OutputHeaderVarName="g_flexExt_UpdateForceFields"> "${user:ProjectRoot}/extensions/dx/shaders/flexExt.UpdateForceFields.hlsl" </File>
+      </HLSL>
+
+      <Conditional value="${config}" match="internal">
+        <Dependencies>
+          flexD3D12
+        </Dependencies>
+      </Conditional>
+
+    </Target>
+  </Project>
+</XPJ>
\ No newline at end of file