Browse code

windows: rework zig toolchain setup and fix compilation with raylib 5.5

Dario Rodriguez authored on 25/07/2025 14:13:54
Showing 2 changed files
... ...
@@ -100,6 +100,7 @@
100 100
 
101 101
 #define SCROLLTHRESHOLD (LEFTIMAGESIDELEN/3)
102 102
 
103
+
103 104
 #if defined(SIMANDROID)
104 105
 #undef ROOTDIR
105 106
 #define ROOTDIR "/var/www/default/animeshot/"
... ...
@@ -150,7 +151,7 @@ int MessageBoxA(void *hWnd,void *lpText,void *lpCaption,unsigned int uType);
150 151
 
151 152
 
152 153
 
153
-#if !defined(__linux__) && !defined(ANDROID)
154
+#if !defined(__linux__) && !defined(ANDROID) && RAYLIB_VERSION_MAJOR==5 && RAYLIB_VERSION_MINOR==0
154 155
 /* the old raylib used in the windows build lacks this function */
155 156
 bool IsImageValid(Image image)
156 157
 {
... ...
@@ -397,7 +398,7 @@ main(int argc, char *argv[])
397 398
                 click_avail=1;
398 399
                 has_mousechanges=(lmbdown!=oldlmbdown || rmbdown!=oldrmbdown || mousepos.x!=oldmousepos.x || mousepos.y!=oldmousepos.y || wheel.x!=0 || wheel.y!=0)?1:0;
399 400
                 needs_nextredraw=0;
400
-                /* process scrolling */
401
+                /* mouse process scrolling */
401 402
                 if(lmbdown==1 && oldlmbdown==0 && scrollstart==0 && mousepos.y>im->body->xywh.y) {
402 403
                         scrollstart=imutil_milliseconds();
403 404
                         scrollstartpos=mousepos;
... ...
@@ -440,7 +441,7 @@ main(int argc, char *argv[])
440 441
                         scrollspeed=scrollspeed*4/5;
441 442
                         im->body->dirdata[im->body->currentdirdata]->leftscrollpos+=scrollspeed;
442 443
                 }
443
-                /* process clicks on menus */
444
+                /* mouse process clicks on menus */
444 445
                 if(click_avail) {
445 446
                         sel_menu=sel_submenu=NULL;
446 447
                         im_menubar_mouse(im->menubar, mousepos, lmbpressed, lmbreleased, lmbdown, &click_avail, &sel_menu, &sel_submenu);
... ...
@@ -146,22 +146,25 @@ https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-12.0.0.r
146 146
 https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-cmake-3.30.5-1-any.pkg.tar.zst
147 147
 https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ninja-1.12.1-1-any.pkg.tar.zst
148 148
 https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkg-config-0.29.2-6-any.pkg.tar.zst
149
-https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-raylib-5.5-2-any.pkg.tar.zst
149
+https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-raylib-5.5-1-any.pkg.tar.zst
150 150
 https://mirror.msys2.org/msys/x86_64/msys2-w32api-headers-10.0.0.r16.g49a56d453-1-x86_64.pkg.tar.zst
151 151
 https://mirror.msys2.org/msys/x86_64/msys2-w32api-runtime-10.0.0.r16.g49a56d453-1-x86_64.pkg.tar.zst
152 152
 https://mirror.msys2.org/msys/x86_64/perl-5.38.2-2-x86_64.pkg.tar.zst
153 153
 EOF
154
-for i in  $(cat deps.txt) ; do
155
-        if [ ! -e ../toolchain-zig-dl/$(basename $i) ] ; then
156
-                (cd ../toolchain-zig-dl && wget $i )
154
+for dep in  $(cat deps.txt) ; do
155
+	i=$(basename $dep)
156
+        if [ ! -e ../toolchain-zig-dl/$i ] ; then
157
+		(cd ../toolchain-zig-dl && wget $dep)
157 158
         fi
158
-done
159
-for i in $(cd ../toolchain-zig-dl && find . -maxdepth 1 -name "*.zst") ; do 
159
+	if echo "$i" | grep "\.zst\$" >/dev/null && [ -e ../toolchain-zig-dl/$i ] ; then
160 160
          ( mkdir -p t ; cd t ; cat ../../toolchain-zig-dl/$i | zstd -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do
161
-          (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done
162
-for i in $(cd ../toolchain-zig-dl && find . -maxdepth 1 -name "*.xz") ; do 
161
+          (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t
162
+	fi
163
+	if echo "$i" | grep "\.xz\$" >/dev/null && [ -e ../toolchain-zig-dl/$i ] ; then
163 164
          ( mkdir -p t ; cd t ; cat ../../toolchain-zig-dl/$i | xz -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do
164
-         (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done
165
+         (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t
166
+	fi 
167
+done
165 168
 cat > add-zst.sh <<'EOF'
166 169
 #!/bin/bash
167 170
 if [ "m$1" == "m" ] || [ "m$1" == "m--help" ] || [ ! -f "$1" ] ; then