Skip to content

Commit

Permalink
project: Update for 1.1.2 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sibras
Sibras committed Sep 9, 2019
1 parent e852ee1 commit 8935134
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion SMP/SMP.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ index 20da1253..1b7bef5d 100644

#define DEFAULT_LANGUAGE "eng"
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 05b881a6..f685d1e1 100644
index 3a356050..0c070e38 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -58,6 +58,12 @@
Expand Down
80 changes: 40 additions & 40 deletions SMP/libbluray.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,9 +794,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -872,9 +872,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -948,9 +948,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1026,9 +1026,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1109,9 +1109,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1196,9 +1196,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1277,9 +1277,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1362,9 +1362,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1445,9 +1445,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1530,9 +1530,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1613,9 +1613,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1698,9 +1698,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1788,9 +1788,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1878,9 +1878,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -1972,9 +1972,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -2066,9 +2066,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -2155,9 +2155,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -2244,9 +2244,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -2337,9 +2337,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down Expand Up @@ -2430,9 +2430,9 @@ rd /s /q "$(OutDir)"\include\libbluray
cd ../
cd $(ProjectDir)
)
if not exist .\src\libbluray-j2se-1.1.1.jar (
if not exist .\src\libbluray-j2se-1.1.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.1.1
ant -f ../src/libbluray/bdj/build.xml -Dbuild=$(IntDir)/jar -Ddist=$(ProjectDir)/src -Dsrc_awt=:java-j2se -Dbootclasspath="" -Dversion=j2se-1.1.2
rd /s /q $(IntDir)\jar
cd ../
cd $(ProjectDir)
Expand Down
Binary file renamed SMP/src/libbluray-awt-j2se-1.1.1.jar → SMP/src/libbluray-awt-j2se-1.1.2.jar
View file
Binary file not shown.
Binary file renamed SMP/src/libbluray-j2se-1.1.1.jar → SMP/src/libbluray-j2se-1.1.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 1
#define BLURAY_VERSION_MICRO 1
#define BLURAY_VERSION_MICRO 2

#define BLURAY_VERSION_STRING "1.1.1"
#define BLURAY_VERSION_STRING "1.1.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.1.1"
#define VERSION "1.1.2"

0 comments on commit 8935134

Please sign in to comment.