Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature-windows-build-compatibility' of https://github.…
…com/andreduvoisin/CompositeEngine into feature-macos
- Loading branch information
Showing
29 changed files
with
782 additions
and
593 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Launch Composite Engine (Windows)", | ||
| "type": "cppvsdbg", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/install/CompositeEngine.exe", | ||
| "cwd": "${workspaceFolder}/install", | ||
| "externalConsole": false, | ||
| "stopAtEntry": false, | ||
| "preLaunchTask": "Build Composite Engine" | ||
| }, | ||
| { | ||
| "name": "Launch Composite Engine (Mac)", | ||
| "type": "cppdbg", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/install/CompositeEngine.app/Contents/MacOS/CompositeEngine", | ||
| "cwd": "${workspaceFolder}/install/CompositeEngine.app/Contents/MacOS", | ||
| "MIMode": "lldb", | ||
| "miDebuggerPath": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-mi", | ||
| "externalConsole": false, | ||
| "stopAtEntry": false, | ||
| "preLaunchTask": "Build Composite Engine" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Create Build Folder", | ||
| "type": "shell", | ||
| "command": "cmake", | ||
| "args": [ | ||
| "-E", | ||
| "make_directory", | ||
| "build" | ||
| ], | ||
| "options": { | ||
| "cwd": "${workspaceFolder}" | ||
| } | ||
| }, | ||
| { | ||
| "label": "Create Install Folder", | ||
| "type": "shell", | ||
| "command": "cmake", | ||
| "args": [ | ||
| "-E", | ||
| "make_directory", | ||
| "install" | ||
| ], | ||
| "options": { | ||
| "cwd": "${workspaceFolder}" | ||
| } | ||
| }, | ||
| { | ||
| "label": "Generate Composite Engine", | ||
| "type": "shell", | ||
| "command": "cmake", | ||
| "args": [ | ||
| "-G", | ||
| "Ninja", | ||
| "-DCMAKE_BUILD_TYPE=\"Debug\"", | ||
| "-DCMAKE_INSTALL_PREFIX=\"${workspaceFolder}/install\"", | ||
| ".." | ||
| ], | ||
| "options": { | ||
| "cwd": "${workspaceFolder}/build" | ||
| }, | ||
| "dependsOn": [ | ||
| "Create Build Folder", | ||
| "Create Install Folder" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "Build Composite Engine", | ||
| "type": "shell", | ||
| "command": "cmake", | ||
| "args": [ | ||
| "--build", | ||
| ".", | ||
| "--target", | ||
| "install" | ||
| ], | ||
| "options": { | ||
| "cwd": "${workspaceFolder}/build" | ||
| }, | ||
| "dependsOn": [ | ||
| "Generate Composite Engine" | ||
| ], | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,37 @@ | ||
| include("${CMAKE_DIR}/FBXSDK.cmake") | ||
| include("${CMAKE_DIR}/GLM.cmake") | ||
| include("${CMAKE_DIR}/STB.cmake") | ||
|
|
||
| if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") | ||
| # By default Ninja and Make builds don't create a subdirectory named after | ||
| # the configuration. | ||
| set(CE_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}") | ||
|
|
||
| # Output binaries (executables, libraries) to the correct directory. | ||
| set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CE_TARGET_OUT_DIR}) | ||
| set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CE_TARGET_OUT_DIR}) | ||
| else() | ||
| set(CE_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>") | ||
| endif() | ||
|
|
||
| add_executable(CompositeAssetConverter ${ASSET_CONVERTER_SRC_FILES}) | ||
|
|
||
| add_dependencies( | ||
| CompositeAssetConverter | ||
| FBXSDK | ||
| GLM | ||
| STB | ||
| ) | ||
| target_link_libraries(CompositeAssetConverter PRIVATE FBXSDK GLM STB) | ||
|
|
||
| source_group(TREE ${CMAKE_SOURCE_DIR} FILES ${ASSET_CONVERTER_SRC_FILES}) | ||
|
|
||
| include_directories(${ASSET_CONVERTER_SRC_DIR}) | ||
| include_directories(${ENGINE_SRC_DIR}) | ||
| target_include_directories(CompositeAssetConverter PRIVATE ${ASSET_CONVERTER_SRC_DIR}) | ||
| target_include_directories(CompositeAssetConverter PRIVATE ${ENGINE_SRC_DIR}) | ||
|
|
||
| if(WIN32) | ||
| if(OS_WINDOWS) | ||
| target_compile_options(CompositeAssetConverter PRIVATE /W3 /WX) | ||
| endif() | ||
|
|
||
| BootstrapFBXSDK(CompositeAssetConverter "asset-converter") | ||
| BootstrapGLM() | ||
| BootstrapSTB() | ||
| install( | ||
| TARGETS CompositeAssetConverter | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" | ||
| ) | ||
| if(OS_WINDOWS) | ||
| install( | ||
| FILES $<TARGET_PDB_FILE:CompositeAssetConverter> | ||
| DESTINATION "${CMAKE_INSTALL_PREFIX}" | ||
| OPTIONAL | ||
| ) | ||
| endif() |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.