diff --git a/.gitignore b/.gitignore index ee9d68415..da95c3a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ singe/font.h singe/icon.h singe/kangarooPunchLogo.h singe/singeLogo.h +videotest/indexing/ diff --git a/singe/kangarooPunchLogo.png b/singe/kangarooPunchLogo.png deleted file mode 100644 index 8f1956101..000000000 --- a/singe/kangarooPunchLogo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d772ccefe12f5f4c4c9f833ffebb326b2e5b291e961761791aa4cb37daa29dc1 -size 169446 diff --git a/singe/kangarooPunchLogo.xcf b/singe/kangarooPunchLogo.xcf new file mode 100644 index 000000000..7d684fb2c --- /dev/null +++ b/singe/kangarooPunchLogo.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd59facecc5d9c2ea10e8eac3eb94877cf188c0452297ce7b2699e355ec645d4 +size 277337 diff --git a/singe/preBuild.sh b/singe/preBuild.sh index 98d62245a..6a1d4485e 100755 --- a/singe/preBuild.sh +++ b/singe/preBuild.sh @@ -21,10 +21,10 @@ if [[ -z $1 ]]; then - G_PLATFORM=pi +# G_PLATFORM=pi # G_PLATFORM=mingw -# G_PLATFORM=linux - G_BITS=32 + G_PLATFORM=linux + G_BITS=64 G_THIRDPARTY=$(pwd)/thirdparty G_DEST="$(pwd)/../thirdparty-build/${G_PLATFORM}/${G_BITS}" else @@ -421,7 +421,11 @@ createEmbeddedBinary font.png font.h FONT_H createEmbeddedBinary icon.png icon.h ICON_H # === Kangaroo Punch Logo === -createEmbeddedBinary kangarooPunchLogo.png kangarooPunchLogo.h KANGAROOPUNCHLOGO_H +if [[ ! -e kangarooPunchLogo.h ]]; then + xcf2png kangarooPunchLogo.xcf -o kangarooPunchLogo.png + createEmbeddedBinary kangarooPunchLogo.png kangarooPunchLogo.h KANGAROOPUNCHLOGO_H + rm kangarooPunchLogo.png +fi # === Singe Logo === if [[ ! -e singeLogo.h ]]; then diff --git a/singe/singe.h b/singe/singe.h index 3e70f81c8..db07b8de8 100644 --- a/singe/singe.h +++ b/singe/singe.h @@ -31,7 +31,7 @@ // Don't forget to update singe.rc! #define SINGE_VERSION 2.00 -#define VERSION_STRING "v2.00b7" +#define VERSION_STRING "v2.00b8" #define COPYRIGHT_END_YEAR "2020" diff --git a/singe/singe.rc b/singe/singe.rc index 3e95afb33..5461fad8d 100644 --- a/singe/singe.rc +++ b/singe/singe.rc @@ -1,7 +1,7 @@ 101 ICON "/tmp/icon.ico" 1 VERSIONINFO -FILEVERSION 2,0,0,7 -PRODUCTVERSION 2,0,0,7 +FILEVERSION 2,0,0,8 +PRODUCTVERSION 2,0,0,8 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Kangaroo Punch Studios" VALUE "FileDescription", "Somewhat Interactive Nostalgic Game Emulator" - VALUE "FileVersion", "2.00b7" + VALUE "FileVersion", "2.00b8" VALUE "InternalName", "Singe" VALUE "LegalCopyright", "Copyright 2006-2020 Scott C. Duensing" VALUE "OriginalFilename", "singe.exe" VALUE "ProductName", "Singe" - VALUE "ProductVersion", "2.00b7" + VALUE "ProductVersion", "2.00b8" END END BLOCK "VarFileInfo" diff --git a/singe/singeLogo.xcf b/singe/singeLogo.xcf index 771ad43a9..2539b8640 100644 --- a/singe/singeLogo.xcf +++ b/singe/singeLogo.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ef2f54ed6fa79904c5c1ce854a4ae35dde3bb1f3abafb122081c9025acec49d -size 2854154 +oid sha256:31446cf7492bfadce0029b511bdb1d556d908adba41e688afc6728f0e13c70b3 +size 911807