test irrklang pro

appveyor.yml

@@ -4,6 +4,11 @@ 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=
 
 install:
   - git submodule update --init --recursive
@@ -35,9 +40,13 @@ install:
   - 7z x sqlite-amalgamation-3200100.zip
   - move sqlite-amalgamation-3200100 sqlite3
   
-  - 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 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
 
   # let premake happy
   - xcopy /E premake\* .
@@ -96,4 +105,4 @@ cache:
   - irrlicht-1.8.4.zip
   - lua-5.2.4.tar.gz
   - sqlite-amalgamation-3200100.zip
-  - irrKlang-32bit-1.5.0.zip
+  #- irrKlang-32bit-1.5.0.zip

gframe/premake4.lua

@@ -6,13 +6,23 @@ project "ygopro"
     files { "**.cpp", "**.cc", "**.c", "**.h" }
     excludes "lzma/**"
     includedirs { "../ocgcore" }
-    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event", "irrKlang"}
+    links { "ocgcore", "clzma", "Irrlicht", "freetype", "sqlite3", "lua" , "event" }
 
     configuration "windows"
         files "ygopro.rc"
         excludes "CGUIButton.cpp"
-        includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3", "../irrklang/include" }
-		libdirs { "../irrklang/lib/Win32-visualStudio" }
+        includedirs { "../irrlicht/include", "../freetype/include", "../event/include", "../sqlite3" }
+        if USE_IRRKLANG then
+			defines { "YGOPRO_USE_IRRKLANG" }
+			links { "irrKlang" }
+			includedirs { "../irrklang/include" }
+			if IRRKLANG_PRO then
+				defines { "IRRKLANG_STATIC" }
+				libdirs { "../irrklang/bin/win32-visualstudio_lib" }
+			else
+				libdirs { "../irrklang/lib/Win32-visualStudio" }
+			end
+		end
         links { "opengl32", "ws2_32", "winmm", "gdi32", "kernel32", "user32", "imm32" }
     configuration {"windows", "not vs*"}
         includedirs { "/mingw/include/irrlicht", "/mingw/include/freetype2" }

premake/gframe/__iob_func_fix.cpp

+#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

premake5.lua

@@ -3,6 +3,9 @@ solution "ygo"
     language "C++"
     objdir "obj"
 
+    USE_IRRKLANG = true
+    IRRKLANG_PRO = true
+
     configurations { "Debug", "Release" }
 
     configuration "windows"