default directory for cia and ndsp mus playback

elhobbs · Apr 18, 2017 · 3987aee · 3987aee
1 parent d0171af
commit 3987aee
Show file tree

Hide file tree

Showing 19 changed files with 791 additions and 175 deletions.
diff --git a/Debug/prboom.log b/Debug/prboom.log
@@ -1,10 +1 @@
-Build started 12/31/2015 8:20:03 PM.
-     1>Project "C:\devl\prboom3ds\prboom.vcxproj" on node 2 (Build target(s)).
-     1>Build:
-         make -r 2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/
-         make[1]: Nothing to be done for `all'.
-     1>Done Building Project "C:\devl\prboom3ds\prboom.vcxproj" (Build target(s)).
-
-Build succeeded.
-
-Time Elapsed 00:00:00.32
+  make[1]: Nothing to be done for `all'.
diff --git a/Makefile b/Makefile
@@ -22,19 +22,20 @@ BUILD		:=	build
 SOURCES		:=	src arm9/source arm11/source khax
 DATA		:=	dat
 INCLUDES	:=	include src arm9/include arm11/include khax
-APP_TITLE	:=	prboom3ds
+APP_TITLE	:=	prboom
 APP_DESCRIPTION	:= prboom for the 3ds
 APP_AUTHOR	:= elhobbs
 
 
+
 export	OUTPUT_FORMAT	?= 3dsx
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard
+ARCH	:=	-march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
 
-CFLAGS	:=	-g -Wall -O2 -mword-relocations -save-temps \
+CFLAGS	:=	-g -Wall -O2 -mword-relocations \
 			-fomit-frame-pointer -ffast-math \
 			$(ARCH)
 
@@ -43,8 +44,7 @@ CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
 ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) \
-			-Wl,-Map,$(TARGET).map
+LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(TARGET).map
 
 LIBS	:= -lctru -lm
 
@@ -157,10 +157,10 @@ $(OUTPUT).cia	:	$(OUTPUT).elf
 	arm-none-eabi-strip $(TARGET)_stripped.elf
 ifeq ($(shell uname),Linux)
 	makerom -f cci -rsf $(TOPDIR)/resources/gw_workaround.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -o $(TOPDIR)/$(notdir $(OUTPUT)).3ds
-	makerom -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)/resources/build_cia.rsf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -exefslogo -target t
+	makerom -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)/resources/template.rsf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -exefslogo -target t
 else
-	$(TOPDIR)\resources\makerom.exe -f cci -rsf $(TOPDIR)\resources\gw_workaround.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -o $(TOPDIR)\$(notdir $(OUTPUT)).3ds
-	$(TOPDIR)\resources\makerom.exe -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)\resources\build_cia.rsf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -exefslogo -target t
+	$(TOPDIR)\resources\makerom32.exe -f cci -rsf $(TOPDIR)\resources\gw_workaround.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -o $(TOPDIR)\$(notdir $(OUTPUT)).3ds
+	$(TOPDIR)\resources\makerom32.exe -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)\resources\template.rsf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -exefslogo -target t
 endif
 #	@echo built ... $(notdir $@)
 

diff --git a/arm11/source/3ds_sound.c b/arm11/source/3ds_sound.c
@@ -159,11 +159,16 @@ void MIX_init();
 void MIX_exit();
 void mux_exit();
 
+void mus_stats();
+void mus_dsp_submit();
+
 void S_UpdateSounds(void* listener_p) {
 	mobj_t *listener = (mobj_t*)listener_p;
 	if (!snd_card || nosfxparm)
 		return;
 	MIX_UpdateSounds(listener);
+	//mus_stats();
+	//mus_dsp_submit();
 }
 void mus_init();
 extern int audio_initialized;

diff --git a/arm11/source/Mixer_3ds.cpp b/arm11/source/Mixer_3ds.cpp
@@ -95,7 +95,7 @@ void MixerHardware3DS::update(short *pAudioData, int count)
 	GSPGPU_FlushDataCache(m_soundBuffer, m_bufferSize);
 }
 
-#if 1
+#if 0
 MixerHardware3DS g_mixer(32728, 1);
 
 extern "C" void mixer_update(short *pAudioData, int count) {

diff --git a/arm11/source/hw_mix_csnd.c b/arm11/source/hw_mix_csnd.c
@@ -17,7 +17,7 @@ extern boolean nosfxparm;
 #define S_STEREO_SWING (96 * FRACUNIT)
 #define S_ATTENUATOR ((S_CLIPPING_DIST - S_CLOSE_DIST) >> FRACBITS)
 
-#define MAX_CHANNELS	23
+#define MAX_CHANNELS	22
 
 // Adjustable by menu.
 #define NORM_PITCH 128
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ void MixerHardware3DS::update(short *pAudioData, int count) @@
     	GSPGPU_FlushDataCache(m_soundBuffer, m_bufferSize);
     }
-    #if 1
+    #if 0
     MixerHardware3DS g_mixer(32728, 1);
     extern "C" void mixer_update(short *pAudioData, int count) {
@@ Expand Down @@