update irrklang pro

appveyor.yml

@@ -4,11 +4,8 @@ skip_tags: true
 environment:
   access_token:
     secure: DOOS4g7CT8ctOgiMr62K56qQ1FO6s2ESpqNZlhf8F4nomemvvwxV/pRj9nbKmtjR
-  irrklang_pro:
-    secure: XQY3pqdfMAQcuPgy0cNq//RdaPFrJxF+/9BE5x7t8i8QyI+Q2c7dz0ybNE0RNhR95Q+asmDvARsQdGtTXgfDhRWKTSkkN/2P5tf3Xgq7u+s=
-
-  irrklang_pro_user:
-    secure: OB8Ovwbw/q75ASCjlKT94W9pw2HliIhq4j6J5tMk+7M=
+  irrklang_pro_passwd:
+    secure: 3wmY6LZoi+aLqtpqw2RSx9Ae3Qq91ZV0LM8ghEnwFIpW7tP3jbOUEXxvzg98JYOShMN22iISCDHyfSQIv+xWEA==
 
 install:
   - git submodule update --init --recursive
@@ -43,10 +40,6 @@ install:
   #- bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-32bit-1.5.0.zip ; exit 0"
   #- 7z x irrKlang-32bit-1.5.0.zip
   #- move irrKlang-1.5.0 irrklang
-
-  - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name -u %irrklang_pro_user% %irrklang_pro% ; exit 0"
-  - 7z x irrKlang-pro-1.5.0.zip
-  - move irrKlang-pro-1.5.0 irrklang
   
   - bash -c "curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-32bit-1.5.0.zip ; exit 0"
   - 7z x irrKlang-32bit-1.5.0.zip
@@ -54,6 +47,9 @@ install:
 
   # let premake happy
   - xcopy /E premake\* .
+
+  # use irrklang pro
+  - 7z x irrklang\irrKlang.7z -p%irrklang_pro_passwd% -oirrklang\lib\Win32-visualStudio -y
   
   # patch irrlicht
   - patch -p0 < irrlicht\irrlicht.patch

gframe/premake4.lua

@@ -14,13 +14,12 @@ project "ygopro"
         includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
         if USE_IRRKLANG then
 			defines { "YGOPRO_USE_IRRKLANG" }
-			links { "irrKlang", "ikpMP3" }
+			links { "irrKlang" }
 			includedirs { "../irrklang/include" }
+			libdirs { "../irrklang/lib/Win32-visualStudio" }
 			if IRRKLANG_PRO then
 				defines { "IRRKLANG_STATIC" }
-				libdirs { "../irrklang/bin/win32-visualstudio_lib" }
-			else
-				libdirs { "../irrklang/lib/Win32-visualStudio" }
+				links { "ikpmp3" }
 			end
 		end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }

premake/gframe/__iob_func_fix.cpp

-// fix irrklang static lib don't support VS2015
-// http://blog.csdn.net/10km/article/details/50528908
-
-#if _MSC_VER >= 1900
-#include "stdio.h" 
-_ACRTIMP_ALT FILE* __cdecl __acrt_iob_func(unsigned);
-#ifdef __cplusplus 
-extern "C"
-#endif 
-FILE* __cdecl __iob_func(unsigned i) {
-	return __acrt_iob_func(i);
-}
-#endif // _MSC_VER >= 1900