Merge pull request #12 from froggestspirit/pc_sound

Pc sound

Author: Kurausukun

Makefile_pc

@@ -1,9 +1,19 @@
-PREFIX := i686-w64-mingw32-
+PREFIX := i686-linux-gnu-
 OBJCOPY := $(PREFIX)objcopy
 CC := $(PREFIX)gcc
 AS := $(PREFIX)as
 
-SDL_DIR := /home/pokeemerald/SDL2-2.0.14/i686-w64-mingw32
+# Native Linux build
+ifeq ($(shell uname),Linux)
+  CFLAGS := -m32 -fsanitize=undefined
+  ASFLAGS := --defsym NO_UNDERSCORE_HACK=1
+  PLATFORM_LIBS := -lSDL2
+# Windows
+else
+  PLATFORM_LIBS := -L$(SDL_DIR)/lib  -lmingw32 -lSDLmain -lSDL.dll -lwinmm
+endif
+
+SDL_DIR := /usr/lib/i386-linux-gnu
 ASM_PSEUDO_OP_CONV := sed -e 's/\.4byte/\.int/g;s/\.2byte/\.short/g'
 
 export CPP := $(PREFIX)cpp
@@ -23,8 +33,8 @@ MODERN      := 1
 
 SHELL := /bin/bash -o pipefail
 
-ELF = $(ROM:.exe=.elf)
-MAP = $(ROM:.exe=.map)
+#ELF = $(ROM:.exe=.elf)
+#MAP = $(ROM:.exe=.map)
 
 C_SUBDIR = src
 GFLIB_SUBDIR = gflib
@@ -49,10 +59,10 @@ GCC_VER := $(shell $(CC) -dumpversion)
 
 CC1 	:= $(shell $(PREFIX)gcc --print-prog-name=cc1) -quiet
 override CFLAGS += -Wno-trigraphs -Wimplicit -Wparentheses -Wunused -m32 -std=gnu99 -fno-leading-underscore -fno-dce -fno-builtin -Wno-unused-function -DPORTABLE -DNONMATCHING -D UBFIX -DMODERN=$(MODERN)
-ROM		:= pokeemerald.exe
+ROM		:= pokeemerald.elf
 OBJ_DIR	:= build/pc
 
-CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -D NONMATCHING -D PORTABLE -D MODERN=$(MODERN) -D UBFIX -I$(SDL_DIR)/include -L$(SDL_DIR)/lib
+CPPFLAGS := -DNO_UNDERSCORE_HACK -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -D NONMATCHING -D PORTABLE -D MODERN=$(MODERN) -D UBFIX -I/usr/include/SDL2 -D_REENTRANT
 
 LDFLAGS = -Map ../../$(MAP)
 
@@ -189,7 +199,9 @@ include songs.mk
 $(CRY_SUBDIR)/%.bin: $(CRY_SUBDIR)/%.aif ; $(AIF) $< $@ --compress
 sound/%.bin: sound/%.aif ; $(AIF) $< $@
 
-%src/platform/sdl2.o: CFLAGS += -fleading-underscore
+ifneq ($(shell uname),Linux)
+  %src/platform/sdl2.o: CFLAGS += -fleading-underscore -O3
+endif
 
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=
@@ -267,9 +279,9 @@ LD_SCRIPT_DEPS :=
 $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
 	cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld
 
-$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
-	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
-	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
+#$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
+#	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
+#	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
 
 $(ROM): $(OBJS)
-	$(CC) $(CFLAGS) -Wl,--demangle $^ -static-libgcc -L$(SDL_DIR)/lib -lmingw32 -lSDL2main -lSDL2.dll -lwinmm -lxinput -o $@
+	$(CC) $(CFLAGS) -Wl,--demangle $^ $(PLATFORM_LIBS) -static-libgcc -o $@

include/CGB_sound.h

@@ -0,0 +1,22 @@
+#ifndef CGB_SOUND_H
+#define CGB_SOUND_H
+
+struct AudioCGB{
+    u16 ch1Freq;
+    u8 ch1SweepCounter;
+    u8 ch1SweepCounterI;
+    bool8 ch1SweepDir;
+    u8 ch1SweepShift;
+    u8 Vol[4];
+    u8 VolI[4];
+    u8 Len[4];
+    u8 LenI[4];
+    bool8 LenOn[4];
+    u8 EnvCounter[4];
+    u8 EnvCounterI[4];
+    bool8 EnvDir[4];
+    bool8 DAC[4];
+    s16 WAVRAM[32];
+};
+
+#endif