Skip to content

Commit cd03938

Browse files
authored
Add BuildCombinedDll target and build it with CI (#66)
1 parent ed8f359 commit cd03938

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
$count = git log --oneline | wc -l
2727
echo "Building version $count"
2828
msbuild "Spore ModAPI" -t:BuildDlls -p:BuildVer=$count -p:Config=Release
29+
msbuild "Spore ModAPI" -t:BuildCombinedDll -p:BuildVer=$count -p:Config=Release
2930
3031
- name: Upload compiled files
3132
uses: actions/upload-artifact@v3.1.3
@@ -34,6 +35,7 @@ jobs:
3435
path: |
3536
dll\Release\SporeModAPI.march2017.dll
3637
dll\Release\SporeModAPI.disk.dll
38+
dll\Release\SporeModAPI.combined.dll
3739
dll\Release\SporeModAPI.lib
3840
3941
deploy:
@@ -47,7 +49,7 @@ jobs:
4749
name: compiled-modapi-dlls
4850

4951
- name: Create update bundle
50-
run: zip SporeModAPIdlls.zip SporeModAPI.march2017.dll SporeModAPI.disk.dll SporeModAPI.lib
52+
run: zip SporeModAPIdlls.zip SporeModAPI.march2017.dll SporeModAPI.disk.dll SporeModAPI.combined.dll SporeModAPI.lib
5153

5254
# - name: Upload dlls bundle
5355
# uses: actions/upload-artifact@v3.1.3

Spore ModAPI/Spore ModAPI.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,4 +1088,9 @@
10881088
<Exec Command="msbuild.exe /p:Configuration=&quot;$(Config) DLL&quot; /p:Platform=Win32 /p:SDK_BUILD_VER=$(BuildVer) /p:EXECUTABLE_TYPE=0" />
10891089
<Copy SourceFiles="../dll/$(Config)/SporeModAPI.dll" DestinationFiles="../dll/$(Config)/SporeModAPI.disk.dll" />
10901090
</Target>
1091+
<Target Name="BuildCombinedDll">
1092+
<Message Text="Compiling $(Config) DLL, build $(BuildVer)..." />
1093+
<Exec Command="msbuild.exe /p:Configuration=&quot;$(Config) DLL&quot; /p:Platform=Win32 /p:SDK_BUILD_VER=$(BuildVer) /p:EXECUTABLE_TYPE=10" />
1094+
<Copy SourceFiles="../dll/$(Config)/SporeModAPI.dll" DestinationFiles="../dll/$(Config)/SporeModAPI.combined.dll" />
1095+
</Target>
10911096
</Project>

0 commit comments

Comments
 (0)