Skip to content

Commit 9935bcc

Browse files
JeanPhilippeKernelJeanPhilippeKernel
authored
fixed engine path (#375)
1 parent eda26f6 commit 9935bcc

File tree

4 files changed

+45
-13
lines changed

4 files changed

+45
-13
lines changed

‎.vscode/launch.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"request": "launch",
88
"program": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Debug/net6.0/win-x64/publish/Panzerfaust.dll",
99
"args": [],
10-
"cwd": "${workspaceFolder}",
10+
"cwd": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Debug/net6.0/win-x64/publish",
1111
"stopAtEntry": false,
1212
"console": "internalConsole",
1313
},
@@ -17,7 +17,7 @@
1717
"request": "launch",
1818
"program": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Release/net6.0/win-x64/publish/Panzerfaust.dll",
1919
"args": [],
20-
"cwd": "${workspaceFolder}",
20+
"cwd": "${workspaceFolder}/Result.Windows.x64.MultiConfig/Panzerfaust/Release/net6.0/win-x64/publish",
2121
"stopAtEntry": false,
2222
"console": "internalConsole",
2323
},
@@ -27,7 +27,7 @@
2727
"request": "launch",
2828
"program": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-x64/publish/Panzerfaust.dll",
2929
"args": [],
30-
"cwd": "${workspaceFolder}",
30+
"cwd": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-x64/publish",
3131
"stopAtEntry": false,
3232
"console": "internalConsole",
3333
},
@@ -37,7 +37,7 @@
3737
"request": "launch",
3838
"program": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-x64/publish/Panzerfaust.dll",
3939
"args": [],
40-
"cwd": "${workspaceFolder}",
40+
"cwd": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-x64/publish",
4141
"stopAtEntry": false,
4242
"console": "internalConsole",
4343
},
@@ -47,7 +47,7 @@
4747
"request": "launch",
4848
"program": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-arm64/publish/Panzerfaust.dll",
4949
"args": [],
50-
"cwd": "${workspaceFolder}",
50+
"cwd": "${workspaceFolder}/Result.Darwin.x64.Debug/Panzerfaust/Debug/net6.0/osx-arm64/publish",
5151
"stopAtEntry": false,
5252
"console": "internalConsole",
5353
},
@@ -57,7 +57,7 @@
5757
"request": "launch",
5858
"program": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-arm64/publish/Panzerfaust.dll",
5959
"args": [],
60-
"cwd": "${workspaceFolder}",
60+
"cwd": "${workspaceFolder}/Result.Darwin.x64.Release/Panzerfaust/Release/net6.0/osx-arm64/publish",
6161
"stopAtEntry": false,
6262
"console": "internalConsole",
6363
}

‎CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,3 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
108108
else ()
109109
add_dependencies(AssembleContent Panzerfaust)
110110
endif ()
111-
112-
# Copying Examples dir
113-
#
114-
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json)
115-
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Examples/projectConfig.json DESTINATION ${CMAKE_BINARY_DIR}/Examples)
116-
endif ()

‎Panzerfaust/Service/Engine/EngineService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private void LoadConfig()
2929
{
3030
#if DEBUG
3131
configuration = "Debug";
32-
exampleProjectConfig = @$"{Environment.CurrentDirectory}/../../../Examples/projectConfig.json";
32+
exampleProjectConfig = @$"{Environment.CurrentDirectory}/Examples/projectConfig.json";
3333
engineArgs.Add(exampleProjectConfig);
3434
#else
3535
configuration = "Release";

‎Scripts/PostBuild.ps1

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,17 @@ $ContentsToProcess = @(
8383
Contents = @(
8484
switch ($SystemName) {
8585
"Windows" {
86+
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Editor"}
8687
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"}
8788
}
8889
"Darwin" {
8990
switch ($Architectures) {
9091
"osx-x64" {
92+
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"}
9193
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"}
9294
}
9395
"osx-arm64" {
96+
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Editor"}
9497
@{ From = "$OuputBuildDirectory\Tetragrama\src\$Configurations"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Editor"}
9598
}
9699
Default {
@@ -106,6 +109,41 @@ $ContentsToProcess = @(
106109
}
107110
}
108111
)
112+
},
113+
@{
114+
Name = "Examples"
115+
IsDirectory = $true
116+
Contents = @(
117+
if ($Configurations -eq "Debug") {
118+
switch ($SystemName) {
119+
"Windows" {
120+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Examples"}
121+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"}
122+
}
123+
"Darwin" {
124+
switch ($Architectures) {
125+
"osx-x64" {
126+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"}
127+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Examples"}
128+
}
129+
"osx-arm64" {
130+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\publish\Examples"}
131+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\$Architectures\Examples"}
132+
}
133+
Default {
134+
throw 'This architecture is not supported'
135+
}
136+
}
137+
}
138+
"Linux" {
139+
@{ From = "$RepoRoot\Examples"; To = "$OuputBuildDirectory\Panzerfaust\$Configurations\net6.0\Examples"}
140+
}
141+
Default {
142+
throw 'This system is not supported'
143+
}
144+
}
145+
}
146+
)
109147
}
110148
)
111149

0 commit comments

Comments
 (0)