Skip to content

Commit

Permalink
project: Update for 1.3.2 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Sep 2, 2022
1 parent 8ea1cac commit 0b30d33
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 43 deletions.
40 changes: 20 additions & 20 deletions SMP/libbluray.vcxproj
View file
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
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.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down
40 changes: 20 additions & 20 deletions SMP/libbluray_winrt.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -115,9 +115,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -182,9 +182,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -249,9 +249,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -316,9 +316,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -383,9 +383,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -450,9 +450,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -517,9 +517,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -584,9 +584,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -651,9 +651,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.3.1.jar (
if not exist .\src\libbluray-j2se-1.3.2.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.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.3.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down
1 change: 1 addition & 0 deletions SMP/smp_winrt_deps.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
<ApplicationTypeRevision Condition="'$(VisualStudioVersion)' == '12.0'">8.1</ApplicationTypeRevision>
<WindowsTargetPlatformVersion Condition="'$(ApplicationTypeRevision)|$(WindowsTargetPlatformVersion)' == '10.0|'">10.0.10240.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion Condition="'$(ApplicationTypeRevision)' == '10.0'">10.0.10240.0</WindowsTargetPlatformMinVersion>
<TargetPlatformMinVersion Condition="'$(ApplicationTypeRevision)' == '10.0'">10.0.10240.0</TargetPlatformMinVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'" Label="Configuration">
Expand Down
Binary file renamed SMP/src/libbluray-awt-j2se-1.3.1.jar → SMP/src/libbluray-awt-j2se-1.3.2.jar
View file
Binary file not shown.
Binary file renamed SMP/src/libbluray-j2se-1.3.1.jar → SMP/src/libbluray-j2se-1.3.2.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions SMP/src/libbluray/bluray-version.h
View file
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 1
#define BLURAY_VERSION_MICRO 2

#define BLURAY_VERSION_STRING "1.3.1"
#define BLURAY_VERSION_STRING "1.3.2"

#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
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/* Version number of package */
#define VERSION "1.3.1"
#define VERSION "1.3.2"

0 comments on commit 0b30d33

Please sign in to comment.