Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
606 commits
Select commit Hold shift + click to select a range
867c11e
pix prepare
danoli3 Apr 14, 2023
f2cb926
automake
danoli3 Apr 15, 2023
054d8df
automake fix
danoli3 Apr 15, 2023
a829e6d
Apothecary Updates for Windows Building
danoli3 Apr 15, 2023
ce8afbb
Apothecary Fixes for VSWhere
danoli3 Apr 15, 2023
bc6701b
Fix Assimp VS
danoli3 Apr 15, 2023
9ac28b5
Fix boost downloader
danoli3 Apr 15, 2023
feabf8e
Fix Boost VS
danoli3 Apr 15, 2023
2384e6f
FreeImage add compiling for VS
danoli3 Apr 15, 2023
8f026b5
Download script fixes for wget
danoli3 Apr 15, 2023
7d116cd
Boost fix remove for cpp17
danoli3 Apr 15, 2023
13dd13c
libxml2
danoli3 Apr 15, 2023
365b2e9
Fix up automake - emscripten install path if needed
danoli3 Apr 17, 2023
cf42856
VS ARM Updates
danoli3 Apr 17, 2023
6796c83
FreeImage Fixes
danoli3 Apr 17, 2023
5c312f6
Missing on VS
danoli3 Apr 17, 2023
fafa5f5
FreeImage Fix Emscripten
danoli3 Apr 17, 2023
428e091
VS ARM64 fix
danoli3 Apr 17, 2023
a94af92
Merge commit '8e8d592680b3e1f4a35ee87a08f6182e5dd45e1b' into build-an…
danoli3 Apr 25, 2023
e871f27
Fix Assimp Android
danoli3 Apr 25, 2023
8bf3d47
Assimp Android
danoli3 Apr 25, 2023
2789b92
VS Fixes if 2022 / 2019
danoli3 Apr 25, 2023
7394eb4
FreeImage Emscripten fix
danoli3 Apr 25, 2023
9c22255
libxml2 for pi 6 / arm64
danoli3 Apr 26, 2023
0585d64
vs arm64 libxml2 / pixman working
danoli3 Apr 26, 2023
47e5a54
Fix Android Configure
danoli3 Apr 27, 2023
8123632
iOS Configure detect M1 Apple Silicon processor
danoli3 Apr 27, 2023
c05cf66
uriparser iOS
danoli3 Apr 27, 2023
065c0f6
Apothecary Save State
danoli3 Apr 27, 2023
6fbd0f4
Android fixes
danoli3 Apr 27, 2023
1424c5f
Assimp fix Android
danoli3 Apr 27, 2023
ee2e683
Fix Assimp
danoli3 Apr 27, 2023
ed8440c
Fix libxml2
danoli3 Apr 27, 2023
46c5cef
Added Save / Load Functionality to save overbuilding when doing core …
danoli3 Apr 27, 2023
b011449
Save/Load Optimise
danoli3 Apr 27, 2023
7ab9635
Fix for save
danoli3 Apr 27, 2023
02e1a93
Save to savestate as function was conflicting later
danoli3 Apr 27, 2023
2135b19
Fix Assimp
danoli3 Apr 27, 2023
628e9a4
FreeImage VS
danoli3 Apr 27, 2023
e12202a
FreeImage fix
danoli3 Apr 27, 2023
bffc477
Fix FreeImage copy vs 32 / 64
danoli3 Apr 27, 2023
af02b99
Fix unset
danoli3 Apr 27, 2023
da5626b
libxml2 fix tar
danoli3 Apr 28, 2023
c9bcd87
libxml2 depend
danoli3 Apr 28, 2023
5e36a7a
VS ARM64 - assimp
danoli3 Apr 28, 2023
3ddcdae
VS ARM64 assimp, libpng, libxml2, zlib
danoli3 Apr 28, 2023
7192be9
curl
danoli3 Apr 29, 2023
6d4720b
Libxml2 mac
danoli3 Apr 29, 2023
0291bf3
load fix date macOS
danoli3 Apr 29, 2023
a3f9075
icu fix path
danoli3 Apr 29, 2023
590d225
libxml2 / curl
danoli3 Apr 30, 2023
4476eea
libxml2 fix mv
danoli3 May 1, 2023
5a7366f
remove metal for now
danoli3 May 1, 2023
4254ec6
assimp fix vs
danoli3 May 1, 2023
6a600f7
CMake zlib/libpng make sure to install headers etc
danoli3 May 1, 2023
776c823
Fix pixman build VS
danoli3 May 1, 2023
71586f9
Cairo - vs fixed includes paths for dependancies
danoli3 May 1, 2023
1ca4a89
FreeType / zlib / png cmake fixes
danoli3 May 2, 2023
3a81d59
Cairo 1.17.4 with Cmake for VS to fix issues
danoli3 May 2, 2023
74d0a78
Fix FreeImage android
danoli3 Jun 11, 2023
5cc3fb6
Fixes for Libxml2 and FreeImage
danoli3 Jun 29, 2023
8b8888d
FreeImage / FreeType
danoli3 Jun 29, 2023
f739916
Apothecary save switch
danoli3 Jul 3, 2023
2fc56fd
Apothecary var
danoli3 Jul 3, 2023
132e8ea
Fix for libxml download issues
danoli3 Jul 3, 2023
a7fe29d
LibXML2
danoli3 Jul 3, 2023
6d01082
LibXML2 fix ICU 73.2
danoli3 Jul 3, 2023
98b032b
Fix Apothecary save
danoli3 Jul 3, 2023
bdbffcc
ICU fix for symbol link linux to use zip
danoli3 Jul 3, 2023
47c7f96
FreeType fix download
danoli3 Jul 3, 2023
71f942c
LibPNG 1.6.40 Update - Fix VS Build / Linking with CMake to zlib - Zl…
danoli3 Jul 3, 2023
ab87b0a
Cairo and Deps updates and fixes to paths
danoli3 Jul 3, 2023
5cacc26
Fix LibXML download issues - CMake for Emscripten
danoli3 Jul 4, 2023
e605fd5
LibXML if statement for linuxarm64
danoli3 Jul 4, 2023
c17e668
VS fixes
danoli3 Jul 4, 2023
4feb084
Cairo 1.17.8 - Fixes for build - Cmake
danoli3 Jul 4, 2023
507c806
git workflow moved for now
danoli3 Jul 5, 2023
1108bec
FreeImage 3.19.0
danoli3 Jul 5, 2023
89d9cbc
Fix FreeType
danoli3 Jul 5, 2023
30ba0cb
emscripten building
danoli3 Jul 5, 2023
96bdc66
FreeImage Fix Emscripten
danoli3 Jul 5, 2023
2749429
LibXML2 / zlib - emscripten CMake - working
danoli3 Jul 5, 2023
9e3df87
FreeImage VS Fix
danoli3 Jul 5, 2023
8de3134
LibXML fix for copy Emscripten
danoli3 Jul 5, 2023
c52adfa
OpenCV 4.8.0
danoli3 Jul 19, 2023
ba17f7e
FreeImage copy fix for name
danoli3 Jul 19, 2023
a62e9d7
libxml2 2.11.4 fix copy version file
danoli3 Jul 19, 2023
0d104be
libxml2 fixes for ci
danoli3 Jul 19, 2023
d3c283c
Cairo VS copy fix
danoli3 Jul 19, 2023
7b79087
Curl 8.2.0 VS Cmake working
danoli3 Jul 19, 2023
416a98c
emscripten zlib / libxml2
danoli3 Jul 19, 2023
612a89a
emscripten opencv 4.7.0
danoli3 Jul 19, 2023
b9b3a18
Test Android
danoli3 Jul 19, 2023
e7b4b6d
emscripten opencv copy fix
danoli3 Jul 19, 2023
71aa376
emscripten fix copy libxml2 version.h
danoli3 Jul 19, 2023
0125494
fmod vs wget to downloader
danoli3 Jul 19, 2023
62f0168
VS Test - fix deploy libroot change
danoli3 Jul 19, 2023
dccb0c3
emscripten test -download failing only on tests not local
danoli3 Jul 19, 2023
379ab82
curl follow re-directs
danoli3 Jul 19, 2023
963e162
fix fmod
danoli3 Jul 19, 2023
a1599e9
VS Fix libpng
danoli3 Jul 19, 2023
28fe05b
VS fix fmodex wget
danoli3 Jul 19, 2023
83c3bc6
Android Libs
danoli3 Jul 19, 2023
f38771e
FreeType link fix to new domain
danoli3 Jul 19, 2023
345d052
VS - Fixed GLEW to cmake and fmodex fix
danoli3 Jul 19, 2023
dd97c1b
json - fix wget
danoli3 Jul 19, 2023
0b83a12
VS Build Test
danoli3 Jul 19, 2023
2a927fa
libpng VS - Cmake set to use newer Windows SDK - fix bot errors
danoli3 Jul 24, 2023
31e3b67
libpng 2019 issues
danoli3 Jul 24, 2023
43d4f7c
vs 2022 test ci
danoli3 Jul 24, 2023
e34922d
vs 2022
danoli3 Jul 24, 2023
bacde68
vs2022 support
danoli3 Jul 24, 2023
901eecf
emitt poco
danoli3 Jul 24, 2023
5df34a2
curl lib_root fix
danoli3 Jul 24, 2023
680cc7f
curl
danoli3 Jul 24, 2023
1eedef7
Debugging dependancy
danoli3 Jul 25, 2023
3f1923a
yes build dependancies ... arg
danoli3 Jul 25, 2023
0629c0d
Apothecary fix -d output folder not working / relative for copy now w…
danoli3 Jul 25, 2023
70ee31b
disabled libusb
danoli3 Jul 25, 2023
1528445
libusb to use download script
danoli3 Jul 25, 2023
cef864b
vs2019 workflow fix sdk / build vs scripts can pass bundle number to …
danoli3 Jul 25, 2023
da3d8cc
VideoInput VS updated
danoli3 Jul 25, 2023
c0a7165
Fix unzip logs / Fix download icu if already
danoli3 Jul 25, 2023
e85a6d0
opencv cmake vs fixed 4.3.0
danoli3 Jul 25, 2023
c6ef860
curl 8.2.0 / openssl 1.1.1u - Cmake Working VS / builds OpenSSL
danoli3 Jul 25, 2023
0d9eb8f
openssl / curl clean up
danoli3 Jul 25, 2023
1e83d97
GLFW
danoli3 Jul 25, 2023
b81cc38
pugixml
danoli3 Jul 25, 2023
c8488d4
FreeImage 2019 bot fix
danoli3 Jul 25, 2023
9026bcf
svgtiny vs cmake
danoli3 Jul 25, 2023
e194732
OpenSSL fix VS
danoli3 Jul 27, 2023
8589713
svgtiny VS - fixed broken make-aliases where missing first var / pack…
danoli3 Jul 27, 2023
909db5d
rtAudio 6.0.0 / VS Cmake working arm64/64/32
danoli3 Jul 27, 2023
d5f6759
uriparser VS / arm64 / 64 / 32 - VS 2019 / VS 2022 - Cmake
danoli3 Jul 27, 2023
2852023
tess2 vs arm64/64 working
danoli3 Jul 27, 2023
3009299
vs2022 - arm64 / 64 matrix
danoli3 Jul 27, 2023
aba71d9
vs2019 fix for actions sdk
danoli3 Jul 27, 2023
9704541
vs arm64 fix for fmod/fmodex where no download
danoli3 Jul 27, 2023
d334da2
glew VS arm64 cmakelists patch fix for 32bit bug
danoli3 Jul 27, 2023
dcbb4a0
ios / macOS toolchain update
danoli3 Jul 26, 2023
bcf77b4
VS Poco / 2022 / Cmake Works - Disabled though
danoli3 Jul 28, 2023
17d6769
libusb cmake
danoli3 Aug 2, 2023
3e56333
Updated Scripts for Windows SDK change easily
danoli3 Aug 2, 2023
0a086dc
VS Cmake fixes for Win SDK
danoli3 Aug 2, 2023
7fa8782
Fix OpenCV not copying
danoli3 Aug 3, 2023
aa1189d
Update build-vs.yml
danoli3 Aug 3, 2023
e86db24
Update build-vs-arm64.yml
danoli3 Aug 3, 2023
8df9f34
Update FreeImage.sh
danoli3 Aug 21, 2023
b8bdde3
Android Scripts
danoli3 Aug 22, 2023
356892a
Android Workflow
danoli3 Aug 23, 2023
7332416
Merge commit 'fea8f77186429c46988ac73c7c93c0c6624ee4c3' into build-an…
danoli3 Aug 24, 2023
8dc2334
Merge commit '6ef1f8989d9ecd270b9bf3ebd53f44e3c8971530' into build-an…
danoli3 Aug 24, 2023
81019c3
Merge remote-tracking branch 'upstream/master' into build-android-arm64
danoli3 Sep 5, 2023
2c685b0
Build Merge
danoli3 Sep 5, 2023
aa79d0d
Fix Merge
danoli3 Sep 5, 2023
6f727f0
Update workflow - libs name without master - added 2022 arm64, 64, an…
danoli3 Sep 5, 2023
675f885
Update Scripts with tools
danoli3 Sep 5, 2023
27990ec
linux cmake
danoli3 Sep 5, 2023
d31d093
libxml2 cmake
danoli3 Sep 5, 2023
9652b48
Libxml2
danoli3 Sep 5, 2023
fb7f137
wget fix emscripten
danoli3 Sep 5, 2023
43d2e35
wget fix emscripten / xml2
danoli3 Sep 5, 2023
ec310ab
linux cmake
danoli3 Sep 5, 2023
48d646f
libxml2 release directory
danoli3 Sep 5, 2023
d08b578
libxml2
danoli3 Sep 5, 2023
c212b6e
Windows libxml2
danoli3 Sep 5, 2023
9f1e5a8
Default VS 64 to VS 2022 17
danoli3 Sep 5, 2023
f7aa1bc
libxml2 fix copy
danoli3 Sep 5, 2023
a51fdd1
libxml2 zlib off
danoli3 Sep 7, 2023
11db94b
libxml2 tests off
danoli3 Sep 7, 2023
094f7d3
builds
danoli3 Sep 7, 2023
be9f794
Fix rm bug
danoli3 Sep 10, 2023
99ec55f
Libxml2 fix release output folder, fix bug with rm in delete tests/ru…
danoli3 Sep 10, 2023
de57301
FreeImage Fix emscripten cmake / updated vs
danoli3 Sep 10, 2023
2635805
FreeImage fix build copy vs/emscripten
danoli3 Sep 10, 2023
f61009a
emscripten fix assimp
danoli3 Sep 10, 2023
7a24e6f
libxml2 zlib
danoli3 Sep 10, 2023
ecb95ed
Fix Pugi zip download
danoli3 Sep 10, 2023
e458fcd
Fix assimp and on rebuild clean .o's
danoli3 Sep 10, 2023
b4fad51
libxml2 fix emscripten copy
danoli3 Sep 10, 2023
a0907f5
libxml2 fix
danoli3 Sep 10, 2023
c6d34f3
libpng fix vs
danoli3 Sep 10, 2023
92dcd30
libxml2
danoli3 Sep 10, 2023
60f1853
fix assimp emscripten
danoli3 Sep 10, 2023
3c39793
fix zlib copy for includes
danoli3 Sep 10, 2023
4236ec3
fix cairo copy for includes
danoli3 Sep 10, 2023
3c2ab58
libpng install
danoli3 Sep 10, 2023
61d059f
OpenSSL 1.1.1v - vs fix
danoli3 Sep 10, 2023
1f20de8
fix assimp and next openssl build delete cache
danoli3 Sep 10, 2023
df2bcfe
assimp fixes for emscripten / libxml2 vs
danoli3 Sep 11, 2023
b91bab8
freetype 2.13.2 - cmake emscripten, vs fixes
danoli3 Sep 11, 2023
7fc593a
fix assimp emscripten
danoli3 Sep 11, 2023
fc6f0c3
fix assimp emscripten
danoli3 Sep 12, 2023
27fd962
emscripten fix assimp / freetype
danoli3 Sep 12, 2023
9f28d90
libxml2 copy fix
danoli3 Sep 12, 2023
0161705
runner
danoli3 Sep 12, 2023
eb650f4
runner + linux
danoli3 Sep 13, 2023
d721f60
linux build fix
danoli3 Sep 13, 2023
4a9fced
libxml2 linux copy
danoli3 Sep 13, 2023
90d91ee
linux svgtiny
danoli3 Sep 13, 2023
5e16a96
svgtiny linux
danoli3 Sep 13, 2023
95cfb43
default 64 bit
danoli3 Sep 15, 2023
33d6596
svgtiny fixes
danoli3 Sep 15, 2023
f3d8233
install dox2unix unix install
danoli3 Sep 15, 2023
94fd9ba
msys2 runner off
danoli3 Sep 15, 2023
1f40233
openssl 1.1.1w
danoli3 Sep 15, 2023
912d129
fix svgtiny
danoli3 Sep 18, 2023
f1eeddf
fix svgtiny
danoli3 Sep 18, 2023
d2a1948
fix svgtiny
danoli3 Sep 18, 2023
6b3e252
fix linux svgtiny cmake copy
danoli3 Sep 18, 2023
b6ec02f
copy svgtiny
danoli3 Sep 18, 2023
3cc1c14
fix svgtiny libroot
danoli3 Sep 18, 2023
8cd10f5
svg tiny fix android
danoli3 Sep 18, 2023
fc77daa
Merge remote-tracking branch 'upstream/master' into build-android-arm64
danoli3 Sep 25, 2023
a7392ca
libxml2 -archlinux64
danoli3 Sep 25, 2023
50efc54
svgtiny - fix emscripten
danoli3 Sep 25, 2023
6bcdea4
fix toolchain
danoli3 Sep 25, 2023
eb78f32
Pugi update to v1.13
dimitre Sep 26, 2023
e7db985
svgtiny dependancy +zlib
danoli3 Sep 28, 2023
be42b68
libxml2 android
danoli3 Sep 28, 2023
8902a35
GitHub Actions also build outout libraries for bleeding edge
danoli3 Sep 28, 2023
5eab2c6
Release Tag Update
danoli3 Sep 28, 2023
790692e
Git actions release test disable issue
danoli3 Sep 28, 2023
4272a25
github actions index
danoli3 Sep 28, 2023
a70698f
github actiosn release tag
danoli3 Sep 28, 2023
44de414
github actions order
danoli3 Sep 28, 2023
7e54bbf
svgtiny emscripten
danoli3 Sep 28, 2023
6791a50
svgtiny emscripten
danoli3 Sep 28, 2023
2490172
svgtiny emscripten fix
danoli3 Sep 28, 2023
7530e06
svgtiny release copy
danoli3 Sep 28, 2023
7a527ec
svgtiny emscripten fix
danoli3 Sep 28, 2023
0bcbb16
Merge pull request #286 from danoli3/bleeding
danoli3 Sep 29, 2023
85dc76f
libxml2 android
danoli3 Sep 29, 2023
36350f4
disable emscripten
danoli3 Sep 29, 2023
148b1c6
Merge pull request #288 from danoli3/bleeding
danoli3 Sep 29, 2023
9c7e803
Compress release for bleeding edge in build.sh
danoli3 Sep 29, 2023
4a26348
Compress release for bleeding edge in build.sh (#289)
danoli3 Sep 29, 2023
0f86c00
Merge branch 'bleeding' into pugi
danoli3 Sep 29, 2023
ea65658
Merge pull request #1 from dimitre/pugi
danoli3 Sep 29, 2023
79b32da
github actions fix for libs name including tag
danoli3 Sep 29, 2023
07d4527
Merge pull request #290 from danoli3/bleeding
danoli3 Sep 29, 2023
3446777
build emscripten
danoli3 Sep 29, 2023
78bf0b0
release github actions fix arm64 / 64 zip
danoli3 Oct 1, 2023
e269f6c
Merge pull request #291 from danoli3/bleeding
danoli3 Oct 1, 2023
b3ce0ce
Echo target upload zip in build
danoli3 Oct 1, 2023
5ce2161
Merge pull request #292 from danoli3/bleeding
danoli3 Oct 1, 2023
75bf6db
Fix Github actions
danoli3 Oct 1, 2023
4e1ad8f
Merge pull request #293 from danoli3/bleeding
danoli3 Oct 1, 2023
e704805
Fix build.sh for bleeding head
danoli3 Oct 1, 2023
af6c2e7
Merge pull request #294 from danoli3/bleeding
danoli3 Oct 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix build.sh for bleeding head
  • Loading branch information
danoli3 committed Oct 1, 2023
commit e70480508e6f60d4852646f753e2cb1f344eb717
4 changes: 2 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ if type "ccache" > /dev/null; then
echo $(ccache -s)
fi

if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] || [[ ! -z ${APPVEYOR+x} && -z ${APPVEYOR_PULL_REQUEST_NUMBER+x} ]] || [[ "${GITHUB_REF##*/}" == "master" || "${GITHUB_REF##*/}" == "bleeding" && -z "${GITHUB_HEAD_REF}" ]] ; then
if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] || [[ ! -z ${APPVEYOR+x} && -z ${APPVEYOR_PULL_REQUEST_NUMBER+x} ]] || [[ ("${GITHUB_REF##*/}" == "master" || "${GITHUB_REF##*/}" == "bleeding") && -z "${GITHUB_HEAD_REF}" ]]; then
# exit here on PR's
echo "On Master or Bleeding Branch and not a PR";
echo "On Master or Bleeding Branch and not a PR - zipping build";
else
echo "This is a PR or not master/bleeding branch, exiting build before compressing";
exit 0
Expand Down