Clean up build object paths for consolidation

.github/workflows/build-and-release.yml

@@ -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')"

Makefile.ctr

@@ -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)
 
 
 #---------------------------------------------------------------------------------

README.md

@@ -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.