mirror of
https://github.com/nzp-team/glquake.git
synced 2024-11-10 06:31:35 +00:00
Clean up build object paths for consolidation
This commit is contained in:
parent
cfed805723
commit
c08f727db1
7 changed files with 14 additions and 7 deletions
4
.github/workflows/build-and-release.yml
vendored
4
.github/workflows/build-and-release.yml
vendored
|
@ -19,11 +19,11 @@ jobs:
|
|||
- name: Build
|
||||
working-directory: ./
|
||||
run: |
|
||||
make -f Makefile
|
||||
make -f Makefile.ctr
|
||||
- name: Zip
|
||||
working-directory: ./
|
||||
run: |
|
||||
zip -r ctr-nzp-3dsx.zip nzportable.3dsx nzportable.smdh
|
||||
zip -r ctr-nzp-3dsx.zip build/3ds/bin/nzportable.3dsx build/3ds/bin/nzportable.smdh
|
||||
- name: Generate Build Date
|
||||
id: date
|
||||
run: echo "::set-output name=date::$(date +'%Y-%m-%d-%H-%M-%S')"
|
||||
|
|
|
@ -14,12 +14,12 @@ BUILD := build
|
|||
SOURCES := source
|
||||
#DATA := data
|
||||
INCLUDES := include
|
||||
ICON := icon.png
|
||||
ICON := source/ctr/art/icon.png
|
||||
#ROMFS := romfs
|
||||
|
||||
APP_AUTHOR := NZ:P Team
|
||||
APP_TITLE := Nazi Zombies: Portable
|
||||
APP_DESCRIPTION := Call of Duty Zombies remake, ctrQuake based.
|
||||
APP_DESCRIPTION := Call of Duty Zombies remake
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
|
@ -190,11 +190,19 @@ $(BUILD):
|
|||
@mkdir -p $(BUILD)/ctr
|
||||
@mkdir -p $(BUILD)/ctr/gl
|
||||
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
|
||||
@mkdir -p $(BUILD)/3ds
|
||||
@mkdir -p $(BUILD)/3ds/bin/
|
||||
@mv $(BUILD)/*.o $(BUILD)/3ds/
|
||||
@mv $(BUILD)/*.d $(BUILD)/3ds/
|
||||
@mv $(BUILD)/ctr $(BUILD)/3ds/
|
||||
@mv $(BUILD)/$(TARGET).lst $(BUILD)/3ds/
|
||||
@mv $(BUILD)/$(TARGET).map $(BUILD)/3ds/
|
||||
@mv $(TARGET).* $(BUILD)/3ds/bin/
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
clean:
|
||||
@echo clean ...
|
||||
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
|
||||
@rm -fr $(BUILD)
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
|
@ -16,7 +16,7 @@ make install
|
|||
Now you can navigate to the root of the repository and build the `.3dsx`.
|
||||
|
||||
```bash
|
||||
make -f Makefile
|
||||
make -f Makefile.ctr
|
||||
```
|
||||
|
||||
We also provide prebuilt .3dsx files on the [Releases](https://github.com/nzp-team/glquake/releases/tag/bleeding-edge) page.
|
File diff suppressed because one or more lines are too long
Binary file not shown.
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
Loading…
Reference in a new issue