Skip to content

Commit 6d1f0d8

Browse files
committed
build: make batch scripts use the checkout directory instead of
hardcoded
1 parent 36cb278 commit 6d1f0d8

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.github/workflows/c-cpp.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@ jobs:
1717
Invoke-WebRequest https://github.com/krystalgamer/spidey-decomp-vs/releases/download/v1.0/spidey-vs.zip -OutFile c:\spidey_vs.zip
1818
7z x C:\spidey_vs.zip -oC:\vs
1919
- uses: actions/checkout@v4
20-
- name: Setup spidey-decomp
21-
shell: cmd
22-
run: |
23-
mkdir C:\spidey-decomp
24-
xcopy %GITHUB_WORKSPACE% C:\spidey-decomp /s /e
2520
- name: Build
2621
shell: cmd
27-
working-directory: C:\spidey-decomp
2822
run: build.bat
2923
- name: Validate
3024
shell: cmd

build.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ set PATH=%MSDevDir%\BIN;%MSVCDir%\BIN;%PATH%
66
set INCLUDE=%MSVCDir%\ATL\INCLUDE;%MSVCDir%\INCLUDE;%MSVCDir%\MFC\INCLUDE;%INCLUDE%
77
set LIB=%MSVCDir%\LIB;%MSVCDir%\MFC\LIB;%LIB%
88

9-
nmake /f "spider.mak" CFG="spider - Win32 Release" SPIDEY_DIR="C:\spidey-decomp"
9+
set "oldStr=%~dp0"
10+
set "coolP=%oldStr:~0,-1%"
11+
nmake /f "spider.mak" CFG="spider - Win32 Release" SPIDEY_DIR="%coolP%"

clean.bat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ set PATH=%MSDevDir%\BIN;%MSVCDir%\BIN;%PATH%
66
set INCLUDE=%MSVCDir%\ATL\INCLUDE;%MSVCDir%\INCLUDE;%MSVCDir%\MFC\INCLUDE;%INCLUDE%
77
set LIB=%MSVCDir%\LIB;%MSVCDir%\MFC\LIB;%LIB%
88

9-
nmake /f "spider.mak" CFG="spider - Win32 Release" SPIDEY_DIR="C:\spidey-decomp" clean
9+
set "oldStr=%~dp0"
10+
set "coolP=%oldStr:~0,-1%"
11+
nmake /f "spider.mak" CFG="spider - Win32 Release" SPIDEY_DIR="%coolP%" clean

0 commit comments

Comments
 (0)