Improve Makefiles.

Author: gabordemooij

makefile.win32

@@ -1,6 +1,6 @@
 #Usage: ISO=... CC=i686-w64-mingw32-gcc-8.3-win32 DLLTOOL=i686-w64-mingw32-dlltool make -f makefile.win32
 #Usage with mk: CC=i686-w64-mingw32-gcc-8.3-win32  DLLTOOL=i686-w64-mingw32-dlltool MAKEFILE=makefile.win32 ./mk.sh 
-CFLAGS = -O2 -g -mtune=native -Wall -D CTRLANG=${ISO} -D INCLUDETESTS -D WIN -D WIN32 \
+CFLAGS = -O2 -g -mtune=native -Wall -D CTRLANG=${ISO} -D INCLUDETESTS -D WIN -D WIN32_BIT \
        -D REPLACE_PROGRAM_PASSWORD -D WINDOWS_PROGRAM_PASSWORD\
        -D REPLACE_PLUGIN_SYSTEM    -D WINDOWS_PLUGIN_SYSTEM\
        -D REPLACE_CLOCK_WAIT       -D WINDOWS_CLOCK_WAIT\

mk.sh

@@ -1,17 +1,29 @@
 #!/bin/sh
+
+if [[ -z "$OS" ]]; then
 OS=$(uname -s)
+fi
+
+if [ "$OS" = "Darwin" ]; then
+OS="Mac"
+fi
 
 if [ -z "$MAKEFILE" ]; then
-if [ "$OS" = "OpenBSD" -o "$OS" = "FreeBSD" -o "$OS" = "Darwin" ]; then
+if [ "$OS" = "OpenBSD" -o "$OS" = "FreeBSD" ]; then
 	MAKEFILE=makefile.bsd
 elif [ "$OS" = "Haiku" ]; then
 	MAKEFILE=makefile.haiku
+elif [ "$OS" = "Mac" ]; then
+	MAKEFILE=makefile.mac
+elif [ "$OS" = "Win32" ]; then
+	MAKEFILE=makefile.win32
+elif [ "$OS" = "Win64" ]; then
+	MAKEFILE=makefile.win64
 else
 	MAKEFILE=makefile
 fi
 fi
 
-
 echo "USING: ${MAKEFILE}"
 
 #Get list of ISO codes to build.
@@ -26,6 +38,8 @@ do
 	echo ; echo $ISO
 	export ISO
 	export OS
+	export CC
+	export DLLTOOL
 	make -f $MAKEFILE clean
 	make -f $MAKEFILE all
 	if [ -f "dict/xx${ISO}.dict" ]; then

plugins/media/media.c

@@ -1906,7 +1906,7 @@ ctr_object* ctr_network_basic_text_receive(ctr_object* myself, ctr_argument* arg
 				memcpy(documents[j] + offset, buffer + 27, (int) fmin(chunk_size, total_size - offset));
 			} else {
 				for(j=0; j<max_documents; j++) {
-					#ifdef WIN32
+					#ifdef WIN32_BIT
 					if ((uint32_t) documents[j] == (uint32_t) *((uint64_t*)(buffer + 9))) {
 						break;
 					}