Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

5 files changed, 7 insertions, 114 deletions

diff --git a/tools/compiler/cmake/ApexImporter.cmake b/tools/compiler/cmake/ApexImporter.cmake
index 13a691e..c33d8e6 100644
--- a/tools/compiler/cmake/ApexImporter.cmake
+++ b/tools/compiler/cmake/ApexImporter.cmake
@@ -4,12 +4,14 @@
 
 SET(APEXIMPORTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/ApexImporter/src)
 SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common)
+SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common)
 FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
 FIND_PACKAGE(ApexSDK $ENV{PM_Apex_VERSION} REQUIRED)
 FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED)
 FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)
 FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED)
 
+
 # Include here after the directories are defined so that the platform specific file can use the variables.
 include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/ApexImporter.cmake)
 
@@ -21,13 +23,6 @@ SET(COMMON_FILES
 	${APEXIMPORTER_SOURCE_DIR}/ApexDestructibleObjExporter.h
 	${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.cpp
 	${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.h
-	${TOOLS_COMMON_DIR}/IMeshFileWriter.h
-	${TOOLS_COMMON_DIR}/ObjFileWriter.h
-	${TOOLS_COMMON_DIR}/ObjFileWriter.cpp
-	${TOOLS_COMMON_DIR}/FbxFileWriter.h
-	${TOOLS_COMMON_DIR}/FbxFileWriter.cpp
-	${TOOLS_COMMON_DIR}/FbxUtils.h
-	${TOOLS_COMMON_DIR}/FbxUtils.cpp
 )
 
 ADD_EXECUTABLE(ApexImporter 
@@ -71,7 +66,7 @@ SET_TARGET_PROPERTIES(ApexImporter PROPERTIES
 
 # Do final direct sets after the target has been defined
 TARGET_LINK_LIBRARIES(ApexImporter 
-	PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport Rpcrt4 $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}> 
+	PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization Rpcrt4 $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}> 
 	PRIVATE ${FBXSDK_LIBRARIES}
 )
 
diff --git a/tools/compiler/cmake/AuthoringTool.cmake b/tools/compiler/cmake/AuthoringTool.cmake
index 3ba77d8..82132b9 100644
--- a/tools/compiler/cmake/AuthoringTool.cmake
+++ b/tools/compiler/cmake/AuthoringTool.cmake
@@ -22,21 +22,7 @@ SET(COMMON_FILES
 	${AUTHORTINGTOOL_PLATFORM_COMMON_FILES}
 	
 	${AUTHORTINGTOOL_SOURCE_DIR}/AuthoringTool.cpp
-	${TOOLS_COMMON_SOURCE_DIR}/IMeshFileReader.h
-	${TOOLS_COMMON_SOURCE_DIR}/IMeshFileWriter.h
-	${TOOLS_COMMON_SOURCE_DIR}/FbxFileReader.h
-	${TOOLS_COMMON_SOURCE_DIR}/FbxFileReader.cpp
-	${TOOLS_COMMON_SOURCE_DIR}/ObjFileReader.h
-	${TOOLS_COMMON_SOURCE_DIR}/ObjFileReader.cpp
-	${TOOLS_COMMON_SOURCE_DIR}/ObjFileWriter.h
-	${TOOLS_COMMON_SOURCE_DIR}/ObjFileWriter.cpp
-	${TOOLS_COMMON_SOURCE_DIR}/FbxFileWriter.h
-	${TOOLS_COMMON_SOURCE_DIR}/FbxFileWriter.cpp
-	${TOOLS_COMMON_SOURCE_DIR}/FbxUtils.h
-	${TOOLS_COMMON_SOURCE_DIR}/FbxUtils.cpp
 	${AUTHORTINGTOOL_SOURCE_DIR}/SimpleRandomGenerator.h
-	${AUTHORTINGTOOL_SOURCE_DIR}/FractureProcessor.h
-	${AUTHORTINGTOOL_SOURCE_DIR}/FractureProcessor.cpp	
 	${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.h
 	${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.cpp
 )
@@ -63,6 +49,7 @@ TARGET_INCLUDE_DIRECTORIES(AuthoringTool
 	PRIVATE ${EXT_AUTHORING_INCLUDE_DIR}
 	PRIVATE ${TK_INCLUDE_DIR}
 	PRIVATE ${BLAST_ROOT_DIR}/sdk/common
+	PRIVATE ${BLAST_ROOT_DIR}/sdk/extensions/common/include
 	
 	PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
 	PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
@@ -84,7 +71,7 @@ SET_TARGET_PROPERTIES(AuthoringTool PROPERTIES
 
 # Do final direct sets after the target has been defined
 TARGET_LINK_LIBRARIES(AuthoringTool
-	PRIVATE NvBlast NvBlastTk NvBlastExtSerialization NvBlastExtPhysX NvBlastExtAuthoring 
+	PRIVATE NvBlast NvBlastTk NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization NvBlastExtPhysX NvBlastExtExporter NvBlastExtAuthoring
 	PRIVATE ${FBXSDK_LIBRARIES}
 )
 
diff --git a/tools/compiler/cmake/DataConverter.cmake b/tools/compiler/cmake/DataConverter.cmake
deleted file mode 100644
index 3239f61..0000000
--- a/tools/compiler/cmake/DataConverter.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Build DataConverter common
-#
-
-SET(DATACONVERTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/DataConverter/src)
-
-FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)
-
-# Include here after the directories are defined so that the platform specific file can use the variables.
-include(${PROJECT_CMAKE_FILES_DIR}/${TARGET_BUILD_PLATFORM}/DataConverter.cmake)
-
-SET(COMMON_FILES
-	${DATACONVERTER_PLATFORM_COMMON_FILES}
-	
-	${DATACONVERTER_SOURCE_DIR}/Main.cpp
-)
-
-ADD_EXECUTABLE(DataConverter 
-	${COMMON_FILES}
-)
-
-set_target_properties(DataConverter 
-	PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}
-	CHECKED_POSTFIX ${CMAKE_CHECKED_POSTFIX}
-	RELEASE_POSTFIX ${CMAKE_RELEASE_POSTFIX}
-	PROFILE_POSTFIX ${CMAKE_PROFILE_POSTFIX}
-)
-
-
-SOURCE_GROUP("src" FILES ${COMMON_FILES})
-
-# Target specific compile options
-
-TARGET_INCLUDE_DIRECTORIES(DataConverter 
-	PRIVATE ${DATACONVERTER_PLATFORM_INCLUDES}
-	PRIVATE ${BLAST_ROOT_DIR}/source/common
-
-	PRIVATE ${TCLAP_INCLUDE_DIRS}
-)
-
-TARGET_COMPILE_DEFINITIONS(DataConverter 
-	PRIVATE ${DATACONVERTER_COMPILE_DEFS}
-)
-
-SET_TARGET_PROPERTIES(DataConverter PROPERTIES 
-	PDB_NAME_DEBUG "DataConverter${CMAKE_DEBUG_POSTFIX}"
-	PDB_NAME_CHECKED "DataConverter${CMAKE_CHECKED_POSTFIX}"
-	PDB_NAME_PROFILE "DataConverter${CMAKE_PROFILE_POSTFIX}"
-	PDB_NAME_RELEASE "DataConverter${CMAKE_RELEASE_POSTFIX}"
-)
-
-# Do final direct sets after the target has been defined
-TARGET_LINK_LIBRARIES(DataConverter NvBlast NvBlastExtConverterLL)
-
-
-ADD_CUSTOM_COMMAND(TARGET DataConverter POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-	${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}
-	${BL_EXE_OUTPUT_DIR}
-)
diff --git a/tools/compiler/cmake/Windows/CMakeLists.txt b/tools/compiler/cmake/Windows/CMakeLists.txt
index 541a209..00c8bbf 100644
--- a/tools/compiler/cmake/Windows/CMakeLists.txt
+++ b/tools/compiler/cmake/Windows/CMakeLists.txt
@@ -45,14 +45,7 @@ SET(CMAKE_RELEASE_POSTFIX "${CMAKE_RELEASE_POSTFIX}_${LIBPATH_SUFFIX}")
 # Should this be here or in the common part?
 #ADD_SUBDIRECTORY(${BLAST_ROOT_DIR}/sdk "${CMAKE_CURRENT_BINARY_DIR}/blast_bin")
 
-
 # Include all of the projects
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/LegacyConverter.cmake)
+INCLUDE(${PROJECT_CMAKE_FILES_DIR}/AuthoringTool.cmake)
 INCLUDE(${PROJECT_CMAKE_FILES_DIR}/ApexImporter.cmake)
-INCLUDE(${PROJECT_CMAKE_FILES_DIR}/DataConverter.cmake)
-
-# Exclude AuthoringTool because VC12 can't handle Capn Proto.
-if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.0.0)
-	INCLUDE(${PROJECT_CMAKE_FILES_DIR}/AuthoringTool.cmake)
-else()
-	SET(SERIALIZATION_INCLUDED 0)
-endif()
diff --git a/tools/compiler/cmake/Windows/DataConverter.cmake b/tools/compiler/cmake/Windows/DataConverter.cmake
deleted file mode 100644
index a0c5316..0000000
--- a/tools/compiler/cmake/Windows/DataConverter.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Build DataConverter Windows
-#
-
-SET(DATACONVERTER_PLATFORM_COMMON_FILES
-)
-
-SET(DATACONVERTER_PLATFORM_INCLUDES
-)
-
-SET(DATACONVERTER_COMPILE_DEFS
-	# Common to all configurations
-	${BLASTTOOLS_SLN_COMPILE_DEFS};_CONSOLE
-	
-	$<$<CONFIG:debug>:${BLASTTOOLS_SLN_DEBUG_COMPILE_DEFS}>
-	$<$<CONFIG:checked>:${BLASTTOOLS_SLN_CHECKED_COMPILE_DEFS}>
-	$<$<CONFIG:profile>:${BLASTTOOLS_SLN_PROFILE_COMPILE_DEFS}>
-	$<$<CONFIG:release>:${BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS}>
-)
-
-#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES})
-#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP"	)