Skip to content

Commit 2beb8bf

Browse files
SibrasSibras
committed
project: Update for 1.3.1 merge.
1 parent 26d8c64 commit 2beb8bf

File tree

7 files changed

+58
-54
lines changed

7 files changed

+58
-54
lines changed

‎SMP/SMP.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ index 6155ad6a..a7e24757 100644
148148
if (lib_path) {
149149
/* cut library name from path */
150150
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
151-
index b2337e16..698879d4 100644
151+
index 1cb1bfeb..9f0976f7 100644
152152
--- a/src/libbluray/bdj/bdj.c
153153
+++ b/src/libbluray/bdj/bdj.c
154154
@@ -49,6 +49,9 @@
@@ -188,7 +188,7 @@ index b2337e16..698879d4 100644
188188
static char java_home[256] = "";
189189

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

194194
return result;
@@ -210,7 +210,7 @@ index f0cd090a..71c51f54 100644
210210
#endif
211211

212212
diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c
213-
index eef75106..621aa1af 100644
213+
index d45be33c..5a5a7ab6 100644
214214
--- a/src/libbluray/bdnav/meta_parse.c
215215
+++ b/src/libbluray/bdnav/meta_parse.c
216216
@@ -44,6 +44,10 @@
@@ -225,7 +225,7 @@ index eef75106..621aa1af 100644
225225

226226
#define DEFAULT_LANGUAGE "eng"
227227
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
228-
index 86b47f5e..26b6db91 100644
228+
index c4273c0b..b16c5d99 100644
229229
--- a/src/libbluray/bluray.c
230230
+++ b/src/libbluray/bluray.c
231231
@@ -58,6 +58,12 @@
@@ -259,7 +259,7 @@ index dce2c0b9..a7baf678 100644
259259
struct bd_aacs {
260260
void *h_libaacs; /* library handle from dlopen */
261261
diff --git a/src/libbluray/disc/bdplus.c b/src/libbluray/disc/bdplus.c
262-
index 3d896a9c..2879f953 100644
262+
index fe624a98..1b7a4d8e 100644
263263
--- a/src/libbluray/disc/bdplus.c
264264
+++ b/src/libbluray/disc/bdplus.c
265265
@@ -32,6 +32,12 @@

‎SMP/libbluray.vcxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ rd /s /q "$(OutDir)"\include\libbluray
4747
cd ../
4848
cd $(ProjectDir)
4949
)
50-
if not exist .\src\libbluray-j2se-1.3.0.jar (
50+
if not exist .\src\libbluray-j2se-1.3.1.jar (
5151
del .\src\*.jar
52-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
52+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
5353
rd /s /q $(IntDir)\jar
5454
cd ../
5555
cd $(ProjectDir)
@@ -113,9 +113,9 @@ rd /s /q "$(OutDir)"\include\libbluray
113113
cd ../
114114
cd $(ProjectDir)
115115
)
116-
if not exist .\src\libbluray-j2se-1.3.0.jar (
116+
if not exist .\src\libbluray-j2se-1.3.1.jar (
117117
del .\src\*.jar
118-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
118+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
119119
rd /s /q $(IntDir)\jar
120120
cd ../
121121
cd $(ProjectDir)
@@ -180,9 +180,9 @@ rd /s /q "$(OutDir)"\include\libbluray
180180
cd ../
181181
cd $(ProjectDir)
182182
)
183-
if not exist .\src\libbluray-j2se-1.3.0.jar (
183+
if not exist .\src\libbluray-j2se-1.3.1.jar (
184184
del .\src\*.jar
185-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
185+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
186186
rd /s /q $(IntDir)\jar
187187
cd ../
188188
cd $(ProjectDir)
@@ -247,9 +247,9 @@ rd /s /q "$(OutDir)"\include\libbluray
247247
cd ../
248248
cd $(ProjectDir)
249249
)
250-
if not exist .\src\libbluray-j2se-1.3.0.jar (
250+
if not exist .\src\libbluray-j2se-1.3.1.jar (
251251
del .\src\*.jar
252-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
252+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
253253
rd /s /q $(IntDir)\jar
254254
cd ../
255255
cd $(ProjectDir)
@@ -313,9 +313,9 @@ rd /s /q "$(OutDir)"\include\libbluray
313313
cd ../
314314
cd $(ProjectDir)
315315
)
316-
if not exist .\src\libbluray-j2se-1.3.0.jar (
316+
if not exist .\src\libbluray-j2se-1.3.1.jar (
317317
del .\src\*.jar
318-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
318+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
319319
rd /s /q $(IntDir)\jar
320320
cd ../
321321
cd $(ProjectDir)
@@ -379,9 +379,9 @@ rd /s /q "$(OutDir)"\include\libbluray
379379
cd ../
380380
cd $(ProjectDir)
381381
)
382-
if not exist .\src\libbluray-j2se-1.3.0.jar (
382+
if not exist .\src\libbluray-j2se-1.3.1.jar (
383383
del .\src\*.jar
384-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
384+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
385385
rd /s /q $(IntDir)\jar
386386
cd ../
387387
cd $(ProjectDir)
@@ -446,9 +446,9 @@ rd /s /q "$(OutDir)"\include\libbluray
446446
cd ../
447447
cd $(ProjectDir)
448448
)
449-
if not exist .\src\libbluray-j2se-1.3.0.jar (
449+
if not exist .\src\libbluray-j2se-1.3.1.jar (
450450
del .\src\*.jar
451-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
451+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
452452
rd /s /q $(IntDir)\jar
453453
cd ../
454454
cd $(ProjectDir)
@@ -513,9 +513,9 @@ rd /s /q "$(OutDir)"\include\libbluray
513513
cd ../
514514
cd $(ProjectDir)
515515
)
516-
if not exist .\src\libbluray-j2se-1.3.0.jar (
516+
if not exist .\src\libbluray-j2se-1.3.1.jar (
517517
del .\src\*.jar
518-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
518+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
519519
rd /s /q $(IntDir)\jar
520520
cd ../
521521
cd $(ProjectDir)
@@ -580,9 +580,9 @@ rd /s /q "$(OutDir)"\include\libbluray
580580
cd ../
581581
cd $(ProjectDir)
582582
)
583-
if not exist .\src\libbluray-j2se-1.3.0.jar (
583+
if not exist .\src\libbluray-j2se-1.3.1.jar (
584584
del .\src\*.jar
585-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
585+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
586586
rd /s /q $(IntDir)\jar
587587
cd ../
588588
cd $(ProjectDir)
@@ -647,9 +647,9 @@ rd /s /q "$(OutDir)"\include\libbluray
647647
cd ../
648648
cd $(ProjectDir)
649649
)
650-
if not exist .\src\libbluray-j2se-1.3.0.jar (
650+
if not exist .\src\libbluray-j2se-1.3.1.jar (
651651
del .\src\*.jar
652-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
652+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
653653
rd /s /q $(IntDir)\jar
654654
cd ../
655655
cd $(ProjectDir)

‎SMP/libbluray_winrt.vcxproj‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
1616
</ClCompile>
1717
<Lib>
18+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
1819
<AdditionalDependencies>libiconvd_winrt.lib;libfreetyped_winrt.lib;libxml2d_winrt.lib;libfontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
1920
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
2021
</Lib>
@@ -47,9 +48,9 @@ rd /s /q "$(OutDir)"\include\libbluray
4748
cd ../
4849
cd $(ProjectDir)
4950
)
50-
if not exist .\src\libbluray-j2se-1.3.0.jar (
51+
if not exist .\src\libbluray-j2se-1.3.1.jar (
5152
del .\src\*.jar
52-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
53+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
5354
rd /s /q $(IntDir)\jar
5455
cd ../
5556
cd $(ProjectDir)
@@ -81,6 +82,7 @@ del /f /q $(OutDir)\bin\*.jar
8182
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
8283
</ClCompile>
8384
<Lib>
85+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
8486
<AdditionalDependencies>libiconvd_winrt.lib;libfreetyped_winrt.lib;libxml2d_winrt.lib;libfontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
8587
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
8688
</Lib>
@@ -113,9 +115,9 @@ rd /s /q "$(OutDir)"\include\libbluray
113115
cd ../
114116
cd $(ProjectDir)
115117
)
116-
if not exist .\src\libbluray-j2se-1.3.0.jar (
118+
if not exist .\src\libbluray-j2se-1.3.1.jar (
117119
del .\src\*.jar
118-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
120+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
119121
rd /s /q $(IntDir)\jar
120122
cd ../
121123
cd $(ProjectDir)
@@ -149,7 +151,7 @@ del /f /q $(OutDir)\bin\*.jar
149151
<Link>
150152
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
151153
<AdditionalDependencies>iconvd_winrt.lib;freetyped_winrt.lib;xml2d_winrt.lib;fontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
152-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
154+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
153155
</Link>
154156
<PostBuildEvent>
155157
<Command>mkdir "$(OutDir)"\include
@@ -180,9 +182,9 @@ rd /s /q "$(OutDir)"\include\libbluray
180182
cd ../
181183
cd $(ProjectDir)
182184
)
183-
if not exist .\src\libbluray-j2se-1.3.0.jar (
185+
if not exist .\src\libbluray-j2se-1.3.1.jar (
184186
del .\src\*.jar
185-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
187+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
186188
rd /s /q $(IntDir)\jar
187189
cd ../
188190
cd $(ProjectDir)
@@ -216,7 +218,7 @@ del /f /q $(OutDir)\bin\*.jar
216218
<Link>
217219
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
218220
<AdditionalDependencies>iconvd_winrt.lib;freetyped_winrt.lib;xml2d_winrt.lib;fontconfigd_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
219-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
221+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
220222
</Link>
221223
<PostBuildEvent>
222224
<Command>mkdir "$(OutDir)"\include
@@ -247,9 +249,9 @@ rd /s /q "$(OutDir)"\include\libbluray
247249
cd ../
248250
cd $(ProjectDir)
249251
)
250-
if not exist .\src\libbluray-j2se-1.3.0.jar (
252+
if not exist .\src\libbluray-j2se-1.3.1.jar (
251253
del .\src\*.jar
252-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
254+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
253255
rd /s /q $(IntDir)\jar
254256
cd ../
255257
cd $(ProjectDir)
@@ -281,6 +283,7 @@ del /f /q $(OutDir)\bin\*.jar
281283
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
282284
</ClCompile>
283285
<Lib>
286+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
284287
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
285288
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
286289
</Lib>
@@ -313,9 +316,9 @@ rd /s /q "$(OutDir)"\include\libbluray
313316
cd ../
314317
cd $(ProjectDir)
315318
)
316-
if not exist .\src\libbluray-j2se-1.3.0.jar (
319+
if not exist .\src\libbluray-j2se-1.3.1.jar (
317320
del .\src\*.jar
318-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
321+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
319322
rd /s /q $(IntDir)\jar
320323
cd ../
321324
cd $(ProjectDir)
@@ -347,6 +350,7 @@ del /f /q $(OutDir)\bin\*.jar
347350
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
348351
</ClCompile>
349352
<Lib>
353+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
350354
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
351355
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
352356
</Lib>
@@ -379,9 +383,9 @@ rd /s /q "$(OutDir)"\include\libbluray
379383
cd ../
380384
cd $(ProjectDir)
381385
)
382-
if not exist .\src\libbluray-j2se-1.3.0.jar (
386+
if not exist .\src\libbluray-j2se-1.3.1.jar (
383387
del .\src\*.jar
384-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
388+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
385389
rd /s /q $(IntDir)\jar
386390
cd ../
387391
cd $(ProjectDir)
@@ -415,7 +419,7 @@ del /f /q $(OutDir)\bin\*.jar
415419
<Link>
416420
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
417421
<AdditionalDependencies>iconv_winrt.lib;freetype_winrt.lib;xml2_winrt.lib;fontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
418-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
422+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
419423
</Link>
420424
<PostBuildEvent>
421425
<Command>mkdir "$(OutDir)"\include
@@ -446,9 +450,9 @@ rd /s /q "$(OutDir)"\include\libbluray
446450
cd ../
447451
cd $(ProjectDir)
448452
)
449-
if not exist .\src\libbluray-j2se-1.3.0.jar (
453+
if not exist .\src\libbluray-j2se-1.3.1.jar (
450454
del .\src\*.jar
451-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
455+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
452456
rd /s /q $(IntDir)\jar
453457
cd ../
454458
cd $(ProjectDir)
@@ -482,7 +486,7 @@ del /f /q $(OutDir)\bin\*.jar
482486
<Link>
483487
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
484488
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
485-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
489+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
486490
</Link>
487491
<PostBuildEvent>
488492
<Command>mkdir "$(OutDir)"\include
@@ -513,9 +517,9 @@ rd /s /q "$(OutDir)"\include\libbluray
513517
cd ../
514518
cd $(ProjectDir)
515519
)
516-
if not exist .\src\libbluray-j2se-1.3.0.jar (
520+
if not exist .\src\libbluray-j2se-1.3.1.jar (
517521
del .\src\*.jar
518-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
522+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
519523
rd /s /q $(IntDir)\jar
520524
cd ../
521525
cd $(ProjectDir)
@@ -549,7 +553,7 @@ del /f /q $(OutDir)\bin\*.jar
549553
<Link>
550554
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
551555
<AdditionalDependencies>iconv_winrt.lib;freetype_winrt.lib;xml2_winrt.lib;fontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
552-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
556+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
553557
</Link>
554558
<PostBuildEvent>
555559
<Command>mkdir "$(OutDir)"\include
@@ -580,9 +584,9 @@ rd /s /q "$(OutDir)"\include\libbluray
580584
cd ../
581585
cd $(ProjectDir)
582586
)
583-
if not exist .\src\libbluray-j2se-1.3.0.jar (
587+
if not exist .\src\libbluray-j2se-1.3.1.jar (
584588
del .\src\*.jar
585-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
589+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
586590
rd /s /q $(IntDir)\jar
587591
cd ../
588592
cd $(ProjectDir)
@@ -616,7 +620,7 @@ del /f /q $(OutDir)\bin\*.jar
616620
<Link>
617621
<ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
618622
<AdditionalDependencies>libiconv_winrt.lib;libfreetype_winrt.lib;libxml2_winrt.lib;libfontconfig_winrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
619-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
623+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
620624
</Link>
621625
<PostBuildEvent>
622626
<Command>mkdir "$(OutDir)"\include
@@ -647,9 +651,9 @@ rd /s /q "$(OutDir)"\include\libbluray
647651
cd ../
648652
cd $(ProjectDir)
649653
)
650-
if not exist .\src\libbluray-j2se-1.3.0.jar (
654+
if not exist .\src\libbluray-j2se-1.3.1.jar (
651655
del .\src\*.jar
652-
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.0
656+
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.1
653657
rd /s /q $(IntDir)\jar
654658
cd ../
655659
cd $(ProjectDir)

SMP/src/libbluray-awt-j2se-1.3.0.jar renamed to SMP/src/libbluray-awt-j2se-1.3.1.jar

70.5 KB
Binary file not shown.

SMP/src/libbluray-j2se-1.3.0.jar renamed to SMP/src/libbluray-j2se-1.3.1.jar

752 KB
Binary file not shown.

‎SMP/src/libbluray/bluray-version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727

2828
#define BLURAY_VERSION_MAJOR 1
2929
#define BLURAY_VERSION_MINOR 3
30-
#define BLURAY_VERSION_MICRO 0
30+
#define BLURAY_VERSION_MICRO 1
3131

32-
#define BLURAY_VERSION_STRING "1.3.0"
32+
#define BLURAY_VERSION_STRING "1.3.1"
3333

3434
#define BLURAY_VERSION \
3535
BLURAY_VERSION_CODE(BLURAY_VERSION_MAJOR, BLURAY_VERSION_MINOR, BLURAY_VERSION_MICRO)

‎SMP/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/* Version number of package */
2-
#define VERSION "1.3.0"
2+
#define VERSION "1.3.1"

0 commit comments

Comments
 (0)