diff options
Diffstat (limited to 'tools/compiler')
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/ApexImporter.cmake | 162 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/AuthoringTool.cmake | 170 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/LegacyConverter.cmake | 126 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/Windows/ApexImporter.cmake | 40 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/Windows/AuthoringTool.cmake | 42 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/Windows/CMakeLists.txt | 102 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/compiler/cmake/Windows/LegacyConverter.cmake | 40 |
7 files changed, 342 insertions, 340 deletions
diff --git a/tools/compiler/cmake/ApexImporter.cmake b/tools/compiler/cmake/ApexImporter.cmake index f8e4a45..7ab0907 100644..100755 --- a/tools/compiler/cmake/ApexImporter.cmake +++ b/tools/compiler/cmake/ApexImporter.cmake @@ -1,81 +1,81 @@ -# -# Build ApexImporter common -# - -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) -SET(APEX_MODULES_DIR ${BLAST_ROOT_DIR}/sdk/extensions/import/apexmodules) - -FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_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) - -SET(COMMON_FILES - ${APEXIMPORTER_PLATFORM_COMMON_FILES} - - ${APEXIMPORTER_SOURCE_DIR}/Main.cpp - ${APEXIMPORTER_SOURCE_DIR}/ApexDestructibleObjExporter.cpp - ${APEXIMPORTER_SOURCE_DIR}/ApexDestructibleObjExporter.h - ${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.cpp - ${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.h -) - -ADD_EXECUTABLE(ApexImporter - ${COMMON_FILES} -) - -set_target_properties(ApexImporter - 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(ApexImporter - PRIVATE ${APEXIMPORTER_PLATFORM_INCLUDES} - - PRIVATE ${BLAST_ROOT_DIR}/sdk/common - PRIVATE ${TOOLS_COMMON_DIR} - - PRIVATE ${PHYSXSDK_INCLUDE_DIRS} - PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} - PRIVATE ${TCLAP_INCLUDE_DIRS} - PRIVATE ${FBXSDK_INCLUDE_DIRS} - - PRIVATE ${APEX_MODULES_DIR}/nvparutils - - PRIVATE ${APEX_MODULES_DIR}/NvParameterized/include -) - -TARGET_COMPILE_DEFINITIONS(ApexImporter - PRIVATE ${APEXIMPORTER_COMPILE_DEFS} -) - -SET_TARGET_PROPERTIES(ApexImporter PROPERTIES - COMPILE_PDB_NAME_DEBUG "ApexImporter${CMAKE_DEBUG_POSTFIX}" - COMPILE_PDB_NAME_CHECKED "ApexImporter${CMAKE_CHECKED_POSTFIX}" - COMPILE_PDB_NAME_PROFILE "ApexImporter${CMAKE_PROFILE_POSTFIX}" - COMPILE_PDB_NAME_RELEASE "ApexImporter${CMAKE_RELEASE_POSTFIX}" -) - -# Do final direct sets after the target has been defined -TARGET_LINK_LIBRARIES(ApexImporter - PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization Rpcrt4 - PRIVATE ${FBXSDK_LIBRARIES} -) - -ADD_CUSTOM_COMMAND(TARGET ApexImporter POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS} - ${BL_EXE_OUTPUT_DIR} -) +#
+# Build ApexImporter common
+#
+
+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)
+SET(APEX_MODULES_DIR ${BLAST_ROOT_DIR}/sdk/extensions/import/apexmodules)
+
+FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_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)
+
+SET(COMMON_FILES
+ ${APEXIMPORTER_PLATFORM_COMMON_FILES}
+
+ ${APEXIMPORTER_SOURCE_DIR}/Main.cpp
+ ${APEXIMPORTER_SOURCE_DIR}/ApexDestructibleObjExporter.cpp
+ ${APEXIMPORTER_SOURCE_DIR}/ApexDestructibleObjExporter.h
+ ${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.cpp
+ ${BLAST_ROOT_DIR}/tools/common/BlastDataExporter.h
+)
+
+ADD_EXECUTABLE(ApexImporter
+ ${COMMON_FILES}
+)
+
+set_target_properties(ApexImporter
+ 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(ApexImporter
+ PRIVATE ${APEXIMPORTER_PLATFORM_INCLUDES}
+
+ PRIVATE ${BLAST_ROOT_DIR}/sdk/common
+ PRIVATE ${TOOLS_COMMON_DIR}
+
+ PRIVATE ${PHYSXSDK_INCLUDE_DIRS}
+ PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${TCLAP_INCLUDE_DIRS}
+ PRIVATE ${FBXSDK_INCLUDE_DIRS}
+
+ PRIVATE ${APEX_MODULES_DIR}/nvparutils
+
+ PRIVATE ${APEX_MODULES_DIR}/NvParameterized/include
+)
+
+TARGET_COMPILE_DEFINITIONS(ApexImporter
+ PRIVATE ${APEXIMPORTER_COMPILE_DEFS}
+)
+
+SET_TARGET_PROPERTIES(ApexImporter PROPERTIES
+ COMPILE_PDB_NAME_DEBUG "ApexImporter${CMAKE_DEBUG_POSTFIX}"
+ COMPILE_PDB_NAME_CHECKED "ApexImporter${CMAKE_CHECKED_POSTFIX}"
+ COMPILE_PDB_NAME_PROFILE "ApexImporter${CMAKE_PROFILE_POSTFIX}"
+ COMPILE_PDB_NAME_RELEASE "ApexImporter${CMAKE_RELEASE_POSTFIX}"
+)
+
+# Do final direct sets after the target has been defined
+TARGET_LINK_LIBRARIES(ApexImporter
+ PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization Rpcrt4
+ PRIVATE ${FBXSDK_LIBRARIES}
+)
+
+ADD_CUSTOM_COMMAND(TARGET ApexImporter POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}
+ ${BL_EXE_OUTPUT_DIR}
+)
diff --git a/tools/compiler/cmake/AuthoringTool.cmake b/tools/compiler/cmake/AuthoringTool.cmake index 82132b9..3b16da0 100644..100755 --- a/tools/compiler/cmake/AuthoringTool.cmake +++ b/tools/compiler/cmake/AuthoringTool.cmake @@ -1,85 +1,85 @@ -# -# Build AuthoringTool common -# - -SET(AUTHORTINGTOOL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/AuthoringTool/src) -SET(TOOLS_COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common) - -SET(EXT_AUTHORING_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include) -SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include) - -FIND_PACKAGE(PhysXSDK $ENV{PM_PhysXSDK_VERSION} REQUIRED) -FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED) -FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED) -FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_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}/AuthoringTool.cmake) - -SET(COMMON_FILES - ${AUTHORTINGTOOL_PLATFORM_COMMON_FILES} - - ${AUTHORTINGTOOL_SOURCE_DIR}/AuthoringTool.cpp - ${AUTHORTINGTOOL_SOURCE_DIR}/SimpleRandomGenerator.h - ${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.h - ${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.cpp -) - -ADD_EXECUTABLE(AuthoringTool - ${COMMON_FILES} -) - -set_target_properties(AuthoringTool - 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(AuthoringTool - PRIVATE ${AUTHORTINGTOOL_PLATFORM_INCLUDES} - - PRIVATE ${TOOLS_COMMON_SOURCE_DIR} - 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} - PRIVATE ${TCLAP_INCLUDE_DIRS} - PRIVATE ${TINYOBJLOADER_INCLUDE_DIRS} - PRIVATE ${FBXSDK_INCLUDE_DIRS} -) - -TARGET_COMPILE_DEFINITIONS(AuthoringTool - PRIVATE ${AUTHORTINGTOOL_COMPILE_DEFS} -) - -SET_TARGET_PROPERTIES(AuthoringTool PROPERTIES - PDB_NAME_DEBUG "AuthoringTool${CMAKE_DEBUG_POSTFIX}" - PDB_NAME_CHECKED "AuthoringTool${CMAKE_CHECKED_POSTFIX}" - PDB_NAME_PROFILE "AuthoringTool${CMAKE_PROFILE_POSTFIX}" - PDB_NAME_RELEASE "AuthoringTool${CMAKE_RELEASE_POSTFIX}" -) - -# Do final direct sets after the target has been defined -TARGET_LINK_LIBRARIES(AuthoringTool - PRIVATE NvBlast NvBlastTk NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization NvBlastExtPhysX NvBlastExtExporter NvBlastExtAuthoring - PRIVATE ${FBXSDK_LIBRARIES} -) - -# Copy the dlls from the deps - -ADD_CUSTOM_COMMAND(TARGET AuthoringTool POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${APEXSDK_DLLS} ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS} - ${BL_EXE_OUTPUT_DIR} -) - +#
+# Build AuthoringTool common
+#
+
+SET(AUTHORTINGTOOL_SOURCE_DIR ${PROJECT_SOURCE_DIR}/AuthoringTool/src)
+SET(TOOLS_COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common)
+
+SET(EXT_AUTHORING_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/extensions/authoring/include)
+SET(TK_INCLUDE_DIR ${BLAST_ROOT_DIR}/sdk/toolkit/include)
+
+FIND_PACKAGE(PhysXSDK $ENV{PM_PhysXSDK_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK $ENV{PM_PxSharedSDK_VERSION} REQUIRED)
+FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)
+FIND_PACKAGE(tinyObjLoader $ENV{PM_tinyObjLoader_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}/AuthoringTool.cmake)
+
+SET(COMMON_FILES
+ ${AUTHORTINGTOOL_PLATFORM_COMMON_FILES}
+
+ ${AUTHORTINGTOOL_SOURCE_DIR}/AuthoringTool.cpp
+ ${AUTHORTINGTOOL_SOURCE_DIR}/SimpleRandomGenerator.h
+ ${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.h
+ ${TOOLS_COMMON_SOURCE_DIR}/BlastDataExporter.cpp
+)
+
+ADD_EXECUTABLE(AuthoringTool
+ ${COMMON_FILES}
+)
+
+set_target_properties(AuthoringTool
+ 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(AuthoringTool
+ PRIVATE ${AUTHORTINGTOOL_PLATFORM_INCLUDES}
+
+ PRIVATE ${TOOLS_COMMON_SOURCE_DIR}
+ 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}
+ PRIVATE ${TCLAP_INCLUDE_DIRS}
+ PRIVATE ${TINYOBJLOADER_INCLUDE_DIRS}
+ PRIVATE ${FBXSDK_INCLUDE_DIRS}
+)
+
+TARGET_COMPILE_DEFINITIONS(AuthoringTool
+ PRIVATE ${AUTHORTINGTOOL_COMPILE_DEFS}
+)
+
+SET_TARGET_PROPERTIES(AuthoringTool PROPERTIES
+ PDB_NAME_DEBUG "AuthoringTool${CMAKE_DEBUG_POSTFIX}"
+ PDB_NAME_CHECKED "AuthoringTool${CMAKE_CHECKED_POSTFIX}"
+ PDB_NAME_PROFILE "AuthoringTool${CMAKE_PROFILE_POSTFIX}"
+ PDB_NAME_RELEASE "AuthoringTool${CMAKE_RELEASE_POSTFIX}"
+)
+
+# Do final direct sets after the target has been defined
+TARGET_LINK_LIBRARIES(AuthoringTool
+ PRIVATE NvBlast NvBlastTk NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization NvBlastExtPhysX NvBlastExtExporter NvBlastExtAuthoring
+ PRIVATE ${FBXSDK_LIBRARIES}
+)
+
+# Copy the dlls from the deps
+
+ADD_CUSTOM_COMMAND(TARGET AuthoringTool POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${APEXSDK_DLLS} ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}
+ ${BL_EXE_OUTPUT_DIR}
+)
+
diff --git a/tools/compiler/cmake/LegacyConverter.cmake b/tools/compiler/cmake/LegacyConverter.cmake index dde63d0..7a2c959 100644..100755 --- a/tools/compiler/cmake/LegacyConverter.cmake +++ b/tools/compiler/cmake/LegacyConverter.cmake @@ -1,63 +1,63 @@ -# -# Build LegacyConverter common -# - -SET(LEGACYCONVERTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/LegacyConverter/src) - -FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED) -FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED) -FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_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}/LegacyConverter.cmake) - -SET(COMMON_FILES - ${LEGACYCONVERTER_PLATFORM_COMMON_FILES} - - ${LEGACYCONVERTER_SOURCE_DIR}/Main.cpp -) - -ADD_EXECUTABLE(LegacyConverter - ${COMMON_FILES} -) - -set_target_properties(LegacyConverter - 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(LegacyConverter - PRIVATE ${LEGACYCONVERTER_PLATFORM_INCLUDES} - PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} - PRIVATE ${BLAST_ROOT_DIR}/source/common - - PRIVATE ${TCLAP_INCLUDE_DIRS} -) - -TARGET_COMPILE_DEFINITIONS(LegacyConverter - PRIVATE ${LEGACYCONVERTER_COMPILE_DEFS} -) - -SET_TARGET_PROPERTIES(LegacyConverter PROPERTIES - PDB_NAME_DEBUG "LegacyConverter${CMAKE_DEBUG_POSTFIX}" - PDB_NAME_CHECKED "LegacyConverter${CMAKE_CHECKED_POSTFIX}" - PDB_NAME_PROFILE "LegacyConverter${CMAKE_PROFILE_POSTFIX}" - PDB_NAME_RELEASE "LegacyConverter${CMAKE_RELEASE_POSTFIX}" -) - -# Do final direct sets after the target has been defined -TARGET_LINK_LIBRARIES(LegacyConverter NvBlast NvBlastTk NvBlastExtPhysX NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization) - - -ADD_CUSTOM_COMMAND(TARGET LegacyConverter POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS} - ${BL_EXE_OUTPUT_DIR} -) +#
+# Build LegacyConverter common
+#
+
+SET(LEGACYCONVERTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/LegacyConverter/src)
+
+FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED)
+FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED)
+FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_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}/LegacyConverter.cmake)
+
+SET(COMMON_FILES
+ ${LEGACYCONVERTER_PLATFORM_COMMON_FILES}
+
+ ${LEGACYCONVERTER_SOURCE_DIR}/Main.cpp
+)
+
+ADD_EXECUTABLE(LegacyConverter
+ ${COMMON_FILES}
+)
+
+set_target_properties(LegacyConverter
+ 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(LegacyConverter
+ PRIVATE ${LEGACYCONVERTER_PLATFORM_INCLUDES}
+ PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS}
+ PRIVATE ${BLAST_ROOT_DIR}/source/common
+
+ PRIVATE ${TCLAP_INCLUDE_DIRS}
+)
+
+TARGET_COMPILE_DEFINITIONS(LegacyConverter
+ PRIVATE ${LEGACYCONVERTER_COMPILE_DEFS}
+)
+
+SET_TARGET_PROPERTIES(LegacyConverter PROPERTIES
+ PDB_NAME_DEBUG "LegacyConverter${CMAKE_DEBUG_POSTFIX}"
+ PDB_NAME_CHECKED "LegacyConverter${CMAKE_CHECKED_POSTFIX}"
+ PDB_NAME_PROFILE "LegacyConverter${CMAKE_PROFILE_POSTFIX}"
+ PDB_NAME_RELEASE "LegacyConverter${CMAKE_RELEASE_POSTFIX}"
+)
+
+# Do final direct sets after the target has been defined
+TARGET_LINK_LIBRARIES(LegacyConverter NvBlast NvBlastTk NvBlastExtPhysX NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization)
+
+
+ADD_CUSTOM_COMMAND(TARGET LegacyConverter POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS}
+ ${BL_EXE_OUTPUT_DIR}
+)
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}>
+)
+
|