Skip to content

Commit c8e435c

Browse files
trauntstraunts
committed
Merge branch 'development' into ModuleMan
2 parents 95ade2a + b62f65c commit c8e435c

File tree

5 files changed

+41
-40
lines changed

5 files changed

+41
-40
lines changed

‎.github/parameters/macports.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ ports:
1111
- name: minizip
1212
- name: luajit
1313
- name: flac
14-
- name: dylibbundler
14+
- name: dylibbundler
15+
- name: tree

‎.github/workflows/msbuild.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,28 @@ jobs:
4949
runs-on: windows-latest
5050

5151
steps:
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v3
5353

54-
- name: Add MSBuild to PATH
55-
uses: microsoft/setup-msbuild@v1
54+
- name: Add MSBuild to PATH
55+
uses: microsoft/setup-msbuild@v1
5656

57-
- name: Build
58-
working-directory: ${{env.GITHUB_WORKSPACE}}
59-
# Add additional options to the MSBuild command line here (like platform or verbosity level).
60-
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
61-
run: msbuild /m /p:Configuration="${{inputs.build_configuration}}" ${{env.SOLUTION_FILE_PATH}}
57+
- name: Build
58+
working-directory: ${{env.GITHUB_WORKSPACE}}
59+
# Add additional options to the MSBuild command line here (like platform or verbosity level).
60+
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
61+
run: msbuild /m /p:Configuration="${{inputs.build_configuration}}" ${{env.SOLUTION_FILE_PATH}}
6262

63-
- name: Determine executable name
64-
id: executable_name
65-
if: ${{inputs.upload_artefacts}}
66-
run: |
67-
echo "EXECUTABLE_NAME=${{ fromJson(env.NAME_MAPPING)[inputs.build_configuration] }}" >> "$GITHUB_OUTPUT"
68-
shell: bash
63+
- name: Determine executable name
64+
id: executable_name
65+
if: ${{inputs.upload_artefacts}}
66+
run: |
67+
echo "EXECUTABLE_NAME=${{ fromJson(env.NAME_MAPPING)[inputs.build_configuration] }}" >> "$GITHUB_OUTPUT"
68+
shell: bash
6969

70-
- name: Upload Artifact
71-
if: ${{inputs.upload_artefacts}}
72-
uses: actions/upload-artifact@v3
73-
with:
74-
name: ${{ steps.executable_name.outputs.EXECUTABLE_NAME }}
75-
path: D:/a/Cortex-Command-Community-Project-Source/Cortex-Command-Community-Project-Data/${{ steps.executable_name.outputs.EXECUTABLE_NAME }}
76-
if-no-files-found: error
70+
- name: Upload Artifact
71+
if: ${{inputs.upload_artefacts}}
72+
uses: actions/upload-artifact@v3
73+
with:
74+
name: ${{ steps.executable_name.outputs.EXECUTABLE_NAME }}
75+
path: D:/a/Cortex-Command-Community-Project/Cortex-Command-Community-Project/${{ steps.executable_name.outputs.EXECUTABLE_NAME }}
76+
if-no-files-found: error

‎.vscode/launch.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"request": "launch",
1414
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
15-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
15+
"cwd": "${workspaceFolder}",
1616
"preLaunchTask": "meson Build Release",
1717
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
1818
"presentation": {
@@ -27,7 +27,7 @@
2727
},
2828
"request": "launch",
2929
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
30-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
30+
"cwd": "${workspaceFolder}",
3131
"preLaunchTask": "meson Build Debug (Release)",
3232
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
3333
"presentation": {
@@ -42,7 +42,7 @@
4242
},
4343
"request": "launch",
4444
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
45-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
45+
"cwd": "${workspaceFolder}",
4646
"preLaunchTask": "meson Build Debug (Minimal)",
4747
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
4848
"presentation": {
@@ -57,7 +57,7 @@
5757
},
5858
"request": "launch",
5959
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
60-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
60+
"cwd": "${workspaceFolder}",
6161
"preLaunchTask": "meson Build Debug (Full)",
6262
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
6363
"presentation": {
@@ -69,8 +69,8 @@
6969
"name": "msbuild Launch",
7070
"type": "cppvsdbg",
7171
"request": "launch",
72-
"program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.exe",
73-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
72+
"program": "${workspaceFolder}/Cortex Command.exe",
73+
"cwd": "${workspaceFolder}",
7474
"preLaunchTask": "msbuild (Final)",
7575
"presentation": {
7676
"group": "windows"
@@ -80,8 +80,8 @@
8080
"name": "msbuild Debug (Release)",
8181
"type": "cppvsdbg",
8282
"request": "launch",
83-
"program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.release.exe",
84-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
83+
"program": "${workspaceFolder}/Cortex Command.debug.release.exe",
84+
"cwd": "${workspaceFolder}",
8585
"preLaunchTask": "msbuild (Debug Release)",
8686
"presentation": {
8787
"group": "windows"
@@ -91,8 +91,8 @@
9191
"name": "msbuild Debug (Minimal)",
9292
"type": "cppvsdbg",
9393
"request": "launch",
94-
"program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.minimal.exe",
95-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
94+
"program": "${workspaceFolder}/Cortex Command.debug.minimal.exe",
95+
"cwd": "${workspaceFolder}",
9696
"preLaunchTask": "msbuild (Debug Minimal)",
9797
"presentation": {
9898
"group": "windows"
@@ -102,8 +102,8 @@
102102
"name": "msbuild Debug (Full)",
103103
"type": "cppvsdbg",
104104
"request": "launch",
105-
"program": "${workspaceFolder}/../Cortex-Command-Community-Project-Data/Cortex Command.debug.full.exe",
106-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
105+
"program": "${workspaceFolder}/Cortex Command.debug.full.exe",
106+
"cwd": "${workspaceFolder}",
107107
"preLaunchTask": "msbuild (Debug Full)",
108108
"presentation": {
109109
"group": "windows"
@@ -115,7 +115,7 @@
115115
"type": "cppvsdbg",
116116
"request": "launch",
117117
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
118-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
118+
"cwd": "${workspaceFolder}",
119119
"preLaunchTask": "meson Build Release",
120120
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
121121
"presentation": {
@@ -127,7 +127,7 @@
127127
"type": "cppvsdbg",
128128
"request": "launch",
129129
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.release.exe",
130-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
130+
"cwd": "${workspaceFolder}",
131131
"preLaunchTask": "meson Build Debug (Release)",
132132
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
133133
"presentation": {
@@ -139,7 +139,7 @@
139139
"type": "cppvsdbg",
140140
"request": "launch",
141141
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.minimal.exe",
142-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
142+
"cwd": "${workspaceFolder}",
143143
"preLaunchTask": "meson Build Debug (Minimal)",
144144
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
145145
"presentation": {
@@ -151,7 +151,7 @@
151151
"type": "cppvsdbg",
152152
"request": "launch",
153153
"program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.full.exe",
154-
"cwd": "${workspaceFolder}/../Cortex-Command-Community-Project-Data",
154+
"cwd": "${workspaceFolder}",
155155
"preLaunchTask": "meson Build Debug (Full)",
156156
"envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
157157
"presentation": {

‎RTEA.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
5353
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
5454
<IntDir>_Bin\$(Platform)\$(Configuration)\</IntDir>
55-
<OutDir>..\Cortex-Command-Community-Project-Data\</OutDir>
55+
<OutDir>.\</OutDir>
5656
<GenerateManifest>true</GenerateManifest>
5757
<EmbedManifest>true</EmbedManifest>
5858
<EnableUnitySupport>true</EnableUnitySupport>

‎meson_options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
option('debug_type', type: 'combo', choices: ['full','minimal','release'], value:'minimal', description: 'Enable certain Debug features, that might slow down the game')
2-
option('cccpdatadir', type:'string', value:'../Cortex-Command-Community-Project-Data', description: 'Path to the Cortex Command Data Repository')
2+
option('cccpdatadir', type:'string', value:'.', description: 'Path to the Cortex Command Data Repository')
33
option('data_install_dir', type:'string', value:'share/CortexCommand', description: 'Where to install the data files relative to prefix directory')
44
option('install_fmod', type:'boolean', value: true, description: 'Wether to install the fmod library.')
55
option('fmod_dir', type:'string', value:'lib/CortexCommand/', description: 'Where to install the fmod library relative to prefix directory.')

0 commit comments

Comments
 (0)