Permalink
Browse files

Merge branch 'origin-merge' into marcan

Conflicts:

	gc/bte/bte.h
	gc/modplay/modplay.h
	gc/ogc/conf.h
	gc/wiiuse/wiiuse.h
	gc/wiiuse/wpad.h
	libmodplay/gcmodplay.c
	libmodplay/mixer.c
	libmodplay/modplay.c
	libogc/es.c
	libogc/gx.c
	libogc/network_wii.c
	libogc/stm.c
	lwbt/bte.c
	lwbt/btopt.h
	lwbt/hci.c
	lwbt/l2cap.c
	lwbt/l2cap.h
	wiiuse/classic.c
	wiiuse/events.c
	wiiuse/guitar_hero_3.c
	wiiuse/io.c
	wiiuse/io_wii.c
	wiiuse/nunchuk.c
	wiiuse/wpad.c
  • Loading branch information...
2 parents d68ca94 + 0335cc2 commit da1bbf4a46173c69b4d8cc6f8e529131e3792e2b @marcan marcan committed Dec 21, 2008
Showing with 8,107 additions and 3,372 deletions.
  1. +18 −9 Makefile
  2. +0 −6 dsp_mixer/readme.txt
  3. +601 −606 gc/{asnd.h → asndlib.h}
  4. +1 −2 gc/bte/bte.h
  5. +1 −0 gc/gccore.h
  6. +1 −0 gc/gcmodplay.h
  7. +23 −7 gc/gctypes.h
  8. +2 −2 gc/modplay/mixer.h
  9. +2 −2 gc/modplay/modplay.h
  10. +65 −0 gc/ogc/disc_io.h
  11. +2 −0 gc/ogc/dsp.h
  12. +1 −0 gc/ogc/es.h
  13. +1 −1 gc/ogc/exi.h
  14. +0 −57 gc/ogc/tdf.h
  15. +30 −0 gc/ogc/tpl.h
  16. +1 −0 gc/ogc/usb.h
  17. +5 −0 gc/ogc/usbstorage.h
  18. +45 −0 gc/sdcard/gcsd.h
  19. +6 −9 gc/sdcard/wiisd_io.h
  20. +7 −6 gc/wiiuse/wiiuse.h
  21. +2 −2 gc/wiiuse/wpad.h
  22. +1 −1 gc/z/deflate.h
  23. +1 −1 gc/z/zconf.in.h
  24. +1 −1 gc/z/zutil.h
  25. +1 −1 gc/zconf.h
  26. +4,326 −0 gcsdk.vcproj
  27. +822 −944 libogc/asnd.c → libasnd/asndlib.c
  28. +55 −0 libasnd/dsp_mixer.h
  29. +1,089 −1,041 dsp_mixer/dsp_mixer.dsp → libasnd/dsp_mixer/dsp_mixer.s
  30. +2 −3 libmad/mp3player.c
  31. +50 −64 libmodplay/gcmodplay.c
  32. +13 −23 libmodplay/mixer.c
  33. +44 −50 libmodplay/modplay.c
  34. +3 −3 libogc/aram.c
  35. +1 −1 libogc/audio.c
  36. +1 −1 libogc/console.c
  37. +1 −1 libogc/console.h
  38. +24 −7 libogc/dsp.c
  39. +0 −51 libogc/dsp_mixer.h
  40. +3 −2 libogc/es.c
  41. +186 −0 libogc/gcsd.c
  42. +52 −56 libogc/gx.c
  43. +1 −1 libogc/network_wii.c
  44. +1 −2 libogc/pad.c
  45. +3 −0 libogc/stm.c
  46. +1 −1 libogc/system.c
  47. +0 −332 libogc/tdf.c
  48. +5 −0 libogc/timesupp.c
  49. +326 −0 libogc/tpl.c
  50. +185 −0 libogc/usbstorage.c
  51. +17 −3 libogc/wiisd.c
  52. +1 −1 libz/adler32.c
  53. +1 −1 libz/compress.c
  54. +1 −1 libz/crc32.c
  55. +1 −1 libz/deflate.c
  56. +1 −1 libz/gzio.c
  57. +1 −1 libz/trees.c
  58. +1 −1 libz/uncompr.c
  59. +1 −1 libz/zutil.c
  60. +1 −1 lwbt/bte.c
  61. +2 −2 lwbt/hci.c
  62. +6 −7 lwbt/l2cap.c
  63. +2 −2 lwbt/l2cap.h
  64. +4 −4 lwip/netio.c
  65. +9 −7 wiiuse/classic.c
  66. +1 −1 wiiuse/classic.h
  67. +1 −1 wiiuse/dynamics.c
  68. +1 −1 wiiuse/dynamics.h
  69. +12 −12 wiiuse/events.c
  70. +9 −7 wiiuse/guitar_hero_3.c
  71. +1 −1 wiiuse/guitar_hero_3.h
  72. +2 −1 wiiuse/io.c
  73. +3 −3 wiiuse/io_wii.c
  74. +4 −3 wiiuse/nunchuk.c
  75. +1 −1 wiiuse/wiiuse_internal.h
  76. +11 −11 wiiuse/wpad.c
View
@@ -13,8 +13,8 @@ endif
export PATH := $(DEVKITPPC)/bin:$(PATH)
export LIBOGC_MAJOR := 1
-export LIBOGC_MINOR := 6
-export LIBOGC_PATCH := 0
+export LIBOGC_MINOR := 7
+export LIBOGC_PATCH := 1
#---------------------------------------------------------------------------------
PREFIX := powerpc-gekko
@@ -30,7 +30,8 @@ OBJCOPY := $(PREFIX)-objcopy
BUILD := build
GCC_VERSION := $(shell $(DEVKITPPC)/bin/$(CC) -dumpversion)
-DATESTRING := $(shell date +%Y)$(shell date +%m)$(shell date +%d)
+DATESTRING := $(shell date +%Y%m%d)
+VERSTRING := $(LIBOGC_MAJOR).$(LIBOGC_MINOR).$(LIBOGC_PATCH)
#---------------------------------------------------------------------------------
ifeq ($(strip $(PLATFORM)),)
@@ -47,6 +48,7 @@ export BTEDIR := $(BASEDIR)/lwbt
export WIIUSEDIR := $(BASEDIR)/wiiuse
export TINYSMBDIR := $(BASEDIR)/libtinysmb
export LIBZDIR := $(BASEDIR)/libz
+export LIBASNDDIR := $(BASEDIR)/libasnd
export STUBSDIR := $(BASEDIR)/lockstubs
export DEPS := $(BASEDIR)/deps
export LIBS := $(BASEDIR)/lib
@@ -76,6 +78,7 @@ BTELIB := $(LIBDIR)/libbte
WIIUSELIB := $(LIBDIR)/libwiiuse
TINYSMBLIB := $(LIBDIR)/libtinysmb
ZLIB := $(LIBDIR)/libz
+ASNDLIB := $(LIBDIR)/libasnd
STUBSLIB := $(LIBDIR)/libgclibstubs
#---------------------------------------------------------------------------------
@@ -119,6 +122,7 @@ VPATH := $(LWIPDIR) \
$(SDCARDDIR) \
$(TINYSMBDIR) \
$(LIBZDIR) \
+ $(LIBASNDDIR) \
$(STUBSDIR)
@@ -131,7 +135,7 @@ LWIPOBJ := network.o netio.o gcif.o \
ip_addr.o etharp.o loopif.o
#---------------------------------------------------------------------------------
-OGCOBJ := asnd.o\
+OGCOBJ := \
console.o lwp_priority.o lwp_queue.o lwp_threadq.o lwp_threads.o lwp_sema.o \
lwp_messages.o lwp.o lwp_handler.o lwp_stack.o lwp_mutex.o \
lwp_watchdog.o lwp_wkspace.o lwp_objmgr.o lwp_heap.o sys_state.o \
@@ -140,10 +144,10 @@ OGCOBJ := asnd.o\
cache_asm.o system.o system_asm.o cond.o \
gx.o gu.o gu_psasm.o audio.o cache.o decrementer.o \
message.o card.o aram.o depackrnc.o decrementer_handler.o \
- depackrnc1.o dsp.o si.o tdf.o ipc.o ogc_crt0.o \
+ depackrnc1.o dsp.o si.o tpl.o ipc.o ogc_crt0.o \
console_font_8x16.o timesupp.o lock_supp.o newlibc.o usbgecko.o \
sbrk.o malloc_lock.o kprintf.o stm.o ios.o es.o isfs.o usb.o network_common.o \
- sdgecko_io.o sdgecko_buf.o argv.o network_wii.o wiisd.o conf.o usbstorage.o \
+ sdgecko_io.o sdgecko_buf.o gcsd.o argv.o network_wii.o wiisd.o conf.o usbstorage.o \
texconv.o wiilaunch.o
#---------------------------------------------------------------------------------
@@ -177,6 +181,9 @@ ZLIBOBJ := adler32.o compress.o crc32.o gzio.o uncompr.o \
inftrees.o inffast.o
#---------------------------------------------------------------------------------
+ASNDLIBOBJ := asndlib.o
+
+#---------------------------------------------------------------------------------
# Build rules:
#---------------------------------------------------------------------------------
%.o : %.c
@@ -264,6 +271,8 @@ $(TINYSMBLIB).a: $(TINYSMBOBJ)
#---------------------------------------------------------------------------------
$(ZLIB).a: $(ZLIBOBJ)
#---------------------------------------------------------------------------------
+$(ASNDLIB).a: $(ASNDLIBOBJ)
+#---------------------------------------------------------------------------------
$(BTELIB).a: $(BTEOBJ)
#---------------------------------------------------------------------------------
$(WIIUSELIB).a: $(WIIUSEOBJ)
@@ -306,11 +315,11 @@ dist: install-headers
#---------------------------------------------------------------------------------
@tar --exclude=*CVS* --exclude=wii --exclude=cube --exclude=*deps* \
--exclude=*.bz2 --exclude=*include* --exclude=*lib/* --exclude=*docs/*\
- -cvjf libogc-src-$(DATESTRING).tar.bz2 *
- @tar -cvjf libogc-$(DATESTRING).tar.bz2 include lib libogc_license.txt
+ -cvjf libogc-src-$(VERSTRING).tar.bz2 *
+ @tar -cvjf libogc-$(VERSTRING).tar.bz2 include lib libogc_license.txt
-LIBRARIES := $(OGCLIB).a $(MODLIB).a $(MADLIB).a $(DBLIB).a $(ZLIB).a $(TINYSMBLIB).a
+LIBRARIES := $(OGCLIB).a $(MODLIB).a $(MADLIB).a $(DBLIB).a $(ZLIB).a $(TINYSMBLIB).a $(ASNDLIB).a
ifeq ($(PLATFORM),cube)
LIBRARIES += $(BBALIB).a
@@ -1,6 +0,0 @@
-To compile it you need the gcdsptool 1.4 (ask to marcan)
-
-Use:
-
-gcdsptool -c source/dsp_mixer.dsp -o source/dsp_mixer.h
-
Oops, something went wrong. Retry.

0 comments on commit da1bbf4

Please sign in to comment.