Guest User

fixes for building in mingw

a guest
May 1st, 2014
321
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.24 KB | None | 0 0
  1. diff -r orig/vgmstream-master/Makefile vgmstream-master/Makefile
  2. 0a1,3
  3. >
  4. > #export MINGW_PREFIX=i586-mingw32msvc-
  5. >
  6. diff -r orig/vgmstream-master/ext_libs/Makefile.mingw vgmstream-master/ext_libs/Makefile.mingw
  7. 2c2
  8. < export DLLTOOL=i586-mingw32msvc-dlltool
  9. ---
  10. > export DLLTOOL=$(MINGW_PREFIX)dlltool
  11. 11a12,14
  12. >  
  13. > libat3plusdecoder.a: at3plusdecoder.def
  14. >   $(DLLTOOL) -d at3plusdecoder.def -l libat3plusdecoder.a
  15. 14c17
  16. <   rm -f libvorbis.a libmpg123-0.a libg7221_decode.a
  17. ---
  18. >   rm -f libvorbis.a libmpg123-0.a libg7221_decode.a libat3plusdecoder.a
  19. diff -r orig/vgmstream-master/src/Makefile vgmstream-master/src/Makefile
  20. 24c24,25
  21. <     coding/mtaf_decoder.o
  22. ---
  23. >     coding/mtaf_decoder.o\
  24. >     coding/at3_decoder.o
  25. 295c296,297
  26. <     meta/bcstm.o
  27. ---
  28. >     meta/bcstm.o \
  29. >     meta/fsb5.o
  30. diff -r orig/vgmstream-master/src/coding/coding.h vgmstream-master/src/coding/coding.h
  31. 73a74
  32. > #if defined(VGM_USE_MP4V2) && defined(VGM_USE_FDKAAC)
  33. 74a76
  34. > #endif
  35. diff -r orig/vgmstream-master/test/Makefile.mingw vgmstream-master/test/Makefile.mingw
  36. 2,6c2,7
  37. < export CFLAGS=-Wall -O3 -DVGM_USE_G7221 -I../ext_includes
  38. < export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lm
  39. < export CC=i586-mingw32msvc-gcc
  40. < export AR=i586-mingw32msvc-ar
  41. < export STRIP=i586-mingw32msvc-strip
  42. ---
  43. > export CFLAGS=-Wall -O3 "-DVGM_USE_G7221" "-DVGM_USE_MAIATRAC3PLUS" -I../ext_includes
  44. > export LDFLAGS=-L../src -L../ext_libs -static-libgcc -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lat3plusdecoder
  45. > export CC=$(MINGW_PREFIX)gcc
  46. > export AR=$(MINGW_PREFIX)ar
  47. > export STRIP=$(MINGW_PREFIX)strip
  48. > export WINDRES=$(MINGW_PREFIX)windres
  49. 23a25,27
  50. >   $(MAKE) -C ../ext_libs -f Makefile.mingw $@
  51. >
  52. > libat3plusdecoder.a:
  53. diff -r orig/vgmstream-master/version.sh vgmstream-master/version.sh
  54. 3c3
  55. < VERSION="`svnversion "$DIR" | tr : _`"
  56. ---
  57. > VERSION=BLAH
  58. diff -r orig/vgmstream-master/winamp/Makefile vgmstream-master/winamp/Makefile
  59. 2,7c2,7
  60. < export CFLAGS=-Wall -O3 "-DVGM_USE_G7221" -I../ext_includes
  61. < export LDFLAGS=-L../src -L../ext_libs -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lm
  62. < export CC=i586-mingw32msvc-gcc
  63. < export AR=i586-mingw32msvc-ar
  64. < export STRIP=i586-mingw32msvc-strip
  65. < export WINDRES=i586-mingw32msvc-windres
  66. ---
  67. > export CFLAGS=-Wall -O3 "-DVGM_USE_G7221" "-DVGM_USE_MAIATRAC3PLUS" -I../ext_includes
  68. > export LDFLAGS=-L../src -L../ext_libs -static-libgcc -lvgmstream -lvorbis -lmpg123-0 -lg7221_decode -lat3plusdecoder
  69. > export CC=$(MINGW_PREFIX)gcc
  70. > export AR=$(MINGW_PREFIX)ar
  71. > export STRIP=$(MINGW_PREFIX)strip
  72. > export WINDRES=$(MINGW_PREFIX)windres
  73. 9c9
  74. < .PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a
  75. ---
  76. > .PHONY: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libat3plusdecoder.a
  77. 11c11
  78. < in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a in_vgmstream.c resource.o
  79. ---
  80. > in_vgmstream.dll: libvgmstream.a libvorbis.a libmpg123-0.a libg7221_decode.a libat3plusdecoder.a in_vgmstream.c resource.o
  81. 27a28,30
  82. >   $(MAKE) -C ../ext_libs -f Makefile.mingw $@
  83. >
  84. > libat3plusdecoder.a:
  85. diff -r orig/vgmstream-master/winamp/in_vgmstream.c vgmstream-master/winamp/in_vgmstream.c
  86. 101a102
  87. >   "at3\0AT3 Audio File (*.AT3)\0",
Advertisement
Add Comment
Please, Sign In to add comment