Fix: reverted necessary parts of Windows build script

ConsoleClient/make.bash

@@ -65,9 +65,15 @@ build_for_windows () {
   fi
 
   if [ -z $1 ] || [ "$1" == "32" ]; then
+    unset PKG_CONFIG_PATH
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH_32
 
     echo "...Building windows-i686"
+    echo "....PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
 
+    CGO_CFLAGS="-I $PKG_CONFIG_PATH/include/" \
+    CGO_LDFLAGS="-L $PKG_CONFIG_PATH -L /usr/i686-w64-mingw32/lib/ -lwsock32 -lcrypt32 -lgdi32" \
+    CC=/usr/bin/i686-w64-mingw32-gcc \
     GOOS=windows GOARCH=386 go build -v -x -ldflags "$LDFLAGS" -tags "$WINDOWS_BUILD_TAGS" -o bin/windows/${EXE_BASENAME}-i686.exe
     RETVAL=$?
     echo ".....gox completed, exit code: $?"
@@ -82,9 +88,15 @@ build_for_windows () {
   fi
 
   if [ -z $1 ] || [ "$1" == "64" ]; then
+    unset PKG_CONFIG_PATH
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH_64
 
     echo "...Building windows-x86_64"
+    echo "....PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
 
+    CGO_CFLAGS="-I $PKG_CONFIG_PATH/include/" \
+    CGO_LDFLAGS="-L $PKG_CONFIG_PATH -L /usr/x86_64-w64-mingw32/lib/ -lwsock32 -lcrypt32 -lgdi32" \
+    CC=/usr/bin/x86_64-w64-mingw32-gcc \
     GOOS=windows GOARCH=amd64 go build -v -x -ldflags "$LDFLAGS" -tags "$WINDOWS_BUILD_TAGS" -o bin/windows/${EXE_BASENAME}-x86_64.exe
     RETVAL=$?
     if [ $RETVAL != 0 ]; then