Skip to content

Commit

Permalink
project: Update for 1.3.1 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Apr 2, 2022
1 parent 26d8c64 commit 2beb8bf
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 54 deletions.
10 changes: 5 additions & 5 deletions SMP/SMP.patch
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ index 6155ad6a..a7e24757 100644
if (lib_path) {
/* cut library name from path */
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index b2337e16..698879d4 100644
index 1cb1bfeb..9f0976f7 100644
--- a/src/libbluray/bdj/bdj.c
+++ b/src/libbluray/bdj/bdj.c
@@ -49,6 +49,9 @@
Expand Down Expand Up @@ -188,7 +188,7 @@ index b2337e16..698879d4 100644
static char java_home[256] = "";

wchar_t buf_loc[4096] = L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\";
@@ -191,6 +201,7 @@ static void *_load_jvm_win32(const char **p_java_home)
@@ -195,6 +205,7 @@ static void *_load_jvm_win32(const char **p_java_home)
}

return result;
Expand All @@ -210,7 +210,7 @@ index f0cd090a..71c51f54 100644
#endif

diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c
index eef75106..621aa1af 100644
index d45be33c..5a5a7ab6 100644
--- a/src/libbluray/bdnav/meta_parse.c
+++ b/src/libbluray/bdnav/meta_parse.c
@@ -44,6 +44,10 @@
Expand All @@ -225,7 +225,7 @@ index eef75106..621aa1af 100644

#define DEFAULT_LANGUAGE "eng"
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 86b47f5e..26b6db91 100644
index c4273c0b..b16c5d99 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -58,6 +58,12 @@
Expand Down Expand Up @@ -259,7 +259,7 @@ index dce2c0b9..a7baf678 100644
struct bd_aacs {
void *h_libaacs; /* library handle from dlopen */
diff --git a/src/libbluray/disc/bdplus.c b/src/libbluray/disc/bdplus.c
index 3d896a9c..2879f953 100644
index fe624a98..1b7a4d8e 100644
--- a/src/libbluray/disc/bdplus.c
+++ b/src/libbluray/disc/bdplus.c
@@ -32,6 +32,12 @@
Expand Down
40 changes: 20 additions & 20 deletions SMP/libbluray.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -113,9 +113,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -180,9 +180,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -247,9 +247,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -313,9 +313,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -379,9 +379,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -446,9 +446,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -513,9 +513,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -580,9 +580,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -647,9 +647,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down
56 changes: 30 additions & 26 deletions SMP/libbluray_winrt.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libiconvd_winrt.lib;libfreetyped_winrt.lib;libxml2d_winrt.lib;libfontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
</Lib>
Expand Down Expand Up @@ -47,9 +48,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -81,6 +82,7 @@ del /f /q $(OutDir)\bin\*.jar
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libiconvd_winrt.lib;libfreetyped_winrt.lib;libxml2d_winrt.lib;libfontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
</Lib>
Expand Down Expand Up @@ -113,9 +115,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -149,7 +151,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>iconvd_winrt.lib;freetyped_winrt.lib;xml2d_winrt.lib;fontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -180,9 +182,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -216,7 +218,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>iconvd_winrt.lib;freetyped_winrt.lib;xml2d_winrt.lib;fontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -247,9 +249,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -281,6 +283,7 @@ del /f /q $(OutDir)\bin\*.jar
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
</Lib>
Expand Down Expand Up @@ -313,9 +316,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -347,6 +350,7 @@ del /f /q $(OutDir)\bin\*.jar
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
</Lib>
Expand Down Expand Up @@ -379,9 +383,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -415,7 +419,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>iconv_winrt.lib;freetype_winrt.lib;xml2_winrt.lib;fontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -446,9 +450,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -482,7 +486,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -513,9 +517,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -549,7 +553,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>iconv_winrt.lib;freetype_winrt.lib;xml2_winrt.lib;fontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -580,9 +584,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -616,7 +620,7 @@ del /f /q $(OutDir)\bin\*.jar
<Link>
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
</Link>
<PostBuildEvent>
<Command>mkdir "$(OutDir)"\include
Expand Down Expand Up @@ -647,9 +651,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.0.jar (
if not exist .\src\libbluray-j2se-1.3.1.jar (
del .\src\*.jar
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions SMP/src/libbluray/bluray-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

#define BLURAY_VERSION_MAJOR 1
#define BLURAY_VERSION_MINOR 3
#define BLURAY_VERSION_MICRO 0
#define BLURAY_VERSION_MICRO 1

#define BLURAY_VERSION_STRING "1.3.0"
#define BLURAY_VERSION_STRING "1.3.1"

#define BLURAY_VERSION \
BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)
Expand Down
2 changes: 1 addition & 1 deletion SMP/version.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/* Version number of package */
#define VERSION "1.3.0"
#define VERSION "1.3.1"

0 comments on commit 2beb8bf

Please sign in to comment.