Blast 1.1.3. See docs/release_notes.txt.v1.1.3_rc1

4 files changed, 113 insertions, 111 deletions

diff --git a/tools/compiler/cmake/Windows/ApexImporter.cmake b/tools/compiler/cmake/Windows/ApexImporter.cmake
index 6ed576d..17d4234 100644..100755
--- a/tools/compiler/cmake/Windows/ApexImporter.cmake
+++ b/tools/compiler/cmake/Windows/ApexImporter.cmake
@@ -1,20 +1,20 @@
-#
-# Build ApexImporter Windows
-#
-
-SET(APEXIMPORTER_PLATFORM_COMMON_FILES
-)
-
-SET(APEXIMPORTER_PLATFORM_INCLUDES
-)
-
-SET(APEXIMPORTER_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}>
-)
-
+#

+# Build ApexImporter Windows

+#

+

+SET(APEXIMPORTER_PLATFORM_COMMON_FILES

+)

+

+SET(APEXIMPORTER_PLATFORM_INCLUDES

+)

+

+SET(APEXIMPORTER_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}>

+)

+

diff --git a/tools/compiler/cmake/Windows/AuthoringTool.cmake b/tools/compiler/cmake/Windows/AuthoringTool.cmake
index 3dfc954..d41b6e9 100644..100755
--- a/tools/compiler/cmake/Windows/AuthoringTool.cmake
+++ b/tools/compiler/cmake/Windows/AuthoringTool.cmake
@@ -1,20 +1,22 @@
-#
-# Build AuthoringTool Windows
-#
-
-SET(AUTHORTINGTOOL_PLATFORM_COMMON_FILES
-)
-
-SET(AUTHORTINGTOOL_PLATFORM_INCLUDES
-)
-
-SET(AUTHORTINGTOOL_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}>
-)
-
+#

+# Build AuthoringTool Windows

+#

+

+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")

+

+SET(AUTHORTINGTOOL_PLATFORM_COMMON_FILES

+)

+

+SET(AUTHORTINGTOOL_PLATFORM_INCLUDES

+)

+

+SET(AUTHORTINGTOOL_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}>

+)

+

diff --git a/tools/compiler/cmake/Windows/CMakeLists.txt b/tools/compiler/cmake/Windows/CMakeLists.txt
index 00c8bbf..17b942e 100644..100755
--- a/tools/compiler/cmake/Windows/CMakeLists.txt
+++ b/tools/compiler/cmake/Windows/CMakeLists.txt
@@ -1,51 +1,51 @@
-#Platform specific compile flags and project includes
-
-SET(CMAKE_CXX_FLAGS "/EHsc /GR- /GF /MP /Gy /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W4 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")
-
-# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies
-#  we pull in or we're potentially having mismatch issues.
-IF(STATIC_WINCRT)
-	SET(WINCRT_NDEBUG "/MT")
-	SET(WINCRT_DEBUG "/MTd")
-ELSE()
-	SET(WINCRT_NDEBUG "/MD")
-	SET(WINCRT_DEBUG "/MDd")
-ENDIF()
-
-SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")
-SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")
-SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")
-
-# Build PDBs for all configurations
-SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")
-
-IF(CMAKE_CL_64)
-	ADD_DEFINITIONS(-DWIN64)
-ENDIF(CMAKE_CL_64)				
-
-SET(BLASTTOOLS_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)
-
-SET(BLASTTOOLS_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)
-SET(BLASTTOOLS_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)
-SET(BLASTTOOLS_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)
-SET(BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS NDEBUG;)
-
-IF(CMAKE_CL_64)
-	SET(LIBPATH_SUFFIX "x64")
-ELSE(CMAKE_CL_64)
-	SET(LIBPATH_SUFFIX "x86")
-ENDIF(CMAKE_CL_64)				
-
-SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")
-SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")
-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)
+#Platform specific compile flags and project includes

+

+SET(CMAKE_CXX_FLAGS "/EHsc /GR- /GF /MP /Gy /d2Zi+ /errorReport:prompt /fp:fast /Gd /Gm- /GS- /nologo /W4 /WX /Zc:forScope /Zc:inline /Zc:wchar_t /Zi")

+

+# Are we using the static or dynamic RT library? Whatever we use, it needs to be the same in any dependencies

+#  we pull in or we're potentially having mismatch issues.

+IF(STATIC_WINCRT)

+	SET(WINCRT_NDEBUG "/MT")

+	SET(WINCRT_DEBUG "/MTd")

+ELSE()

+	SET(WINCRT_NDEBUG "/MD")

+	SET(WINCRT_DEBUG "/MDd")

+ENDIF()

+

+SET(CMAKE_CXX_FLAGS_DEBUG "/Od /RTCsu ${WINCRT_DEBUG}")

+SET(CMAKE_CXX_FLAGS_CHECKED "/Ox ${WINCRT_NDEBUG}")

+SET(CMAKE_CXX_FLAGS_PROFILE "/Ox ${WINCRT_NDEBUG}")

+SET(CMAKE_CXX_FLAGS_RELEASE "/Ox ${WINCRT_NDEBUG}")

+

+# Build PDBs for all configurations

+SET(CMAKE_SHARED_LINKER_FLAGS "/DEBUG")

+

+IF(CMAKE_CL_64)

+	ADD_DEFINITIONS(-DWIN64)

+ENDIF(CMAKE_CL_64)				

+

+SET(BLASTTOOLS_SLN_COMPILE_DEFS WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;)

+

+SET(BLASTTOOLS_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;)

+SET(BLASTTOOLS_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;)

+SET(BLASTTOOLS_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;)

+SET(BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS NDEBUG;)

+

+IF(CMAKE_CL_64)

+	SET(LIBPATH_SUFFIX "x64")

+ELSE(CMAKE_CL_64)

+	SET(LIBPATH_SUFFIX "x86")

+ENDIF(CMAKE_CL_64)				

+

+SET(CMAKE_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}_${LIBPATH_SUFFIX}")

+SET(CMAKE_PROFILE_POSTFIX "${CMAKE_PROFILE_POSTFIX}_${LIBPATH_SUFFIX}")

+SET(CMAKE_CHECKED_POSTFIX "${CMAKE_CHECKED_POSTFIX}_${LIBPATH_SUFFIX}")

+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)

diff --git a/tools/compiler/cmake/Windows/LegacyConverter.cmake b/tools/compiler/cmake/Windows/LegacyConverter.cmake
index 5653bb9..512753c 100644..100755
--- a/tools/compiler/cmake/Windows/LegacyConverter.cmake
+++ b/tools/compiler/cmake/Windows/LegacyConverter.cmake
@@ -1,20 +1,20 @@
-#
-# Build LegacyConverter Windows
-#
-
-SET(LEGACYCONVERTER_PLATFORM_COMMON_FILES
-)
-
-SET(LEGACYCONVERTER_PLATFORM_INCLUDES
-)
-
-SET(LEGACYCONVERTER_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}>
-)
-
+#

+# Build LegacyConverter Windows

+#

+

+SET(LEGACYCONVERTER_PLATFORM_COMMON_FILES

+)

+

+SET(LEGACYCONVERTER_PLATFORM_INCLUDES

+)

+

+SET(LEGACYCONVERTER_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}>

+)

+