win32 up

ekzobrain · Jul 13, 2013 · cef983c · cef983c
1 parent 07a3ac3
commit cef983c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/win32/READ_ME.txt b/win32/READ_ME.txt
@@ -1,16 +1,16 @@
 You can get the lastest program sources from git repository:
-download sources on link http:https://nodeload.github.com/eiskaltdcpp/eiskaltdcpp/tarball/master
+download sources on link https:https://codeload.github.com/eiskaltdcpp/eiskaltdcpp/tar.gz/master
 or download and install git from https://git-scm.com/
 and run in command line: git clone git:https://github.com/eiskaltdcpp/eiskaltdcpp.git
 
 *******************************************************************************
 Build Depends
 *******************************************************************************
-mingw-get-inst-20120426.exe or later
+mingw-get-inst-20120426.exe
  https://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20120426/mingw-get-inst-20120426.exe/download
 
 qt-win-opensource-4.8.5-mingw.exe or later
- https://releases.qt-project.org/qt4/source/qt-win-opensource-4.8.4-mingw.exe
+ https://releases.qt-project.org/qt4/source/qt-win-opensource-4.8.5-mingw.exe
 
 Win32OpenSSL-1_0_1e.exe or later
  https://www.slproweb.com/download/Win32OpenSSL-1_0_1e.exe
@@ -21,7 +21,7 @@ cmake-2.8.9-win32-x86.exe or later
 nsis-2.46-setup.exe or later
  https://sourceforge.net/projects/nsis/files/NSIS%202/2.46/nsis-2.46-setup.exe/download
 
-boost_1_49_0.tar.bz2 or later
+boost_1_49_0.tar.bz2
  https://sourceforge.net/projects/boost/files/boost/1.49.0/boost_1_49_0.tar.bz2/download
 
 bzip2-1.0.6-4-mingw32-dev.tar.lzma or later
@@ -60,8 +60,8 @@ aspell-0.60.5-1-bin.tar.bz2 or later
 aspell-0.60.5-1-lib.tar.bz2 or later
  https://www.winkde.org/pub/kde/ports/win32/repository/aspell/aspell-0.60.5-1-lib.tar.bz2
 
-libidn-1.25-win32.zip or later
- ftp:https://ftp.gnu.org/gnu/libidn/libidn-1.25-win32.zip
+libidn-1.28-win32.zip or later
+ ftp:https://ftp.gnu.org/gnu/libidn/libidn-1.28-win32.zip
 
 mingw32-qtscriptgenerator-git-26-10-2010.tar.xz or later
  https://eiskaltdc.googlecode.com/files/mingw32-qtscriptgenerator-git-26-10-2010.tar.xz

diff --git a/win32/configure.bat b/win32/configure.bat
@@ -1,3 +1,3 @@
 call variables.bat
 
-cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%" -DSHARE_DIR=resources -DCMAKE_FIND_ROOT_PATH="%MINGW32_DIR%";"%ASPELL_DIR%";"%BOOST_DIR%";"%GETTEXT_DIR%";"%LIBBZ2_DIR%";"%LIBICONV_DIR%";"%LIBIDN_DIR%";"%LIBZ_DIR%";"%LUA_DIR%";"%PCRE_DIR%" -DUSE_ASPELL=ON -DDBUS_NOTIFY=OFF -DFORCE_XDG=OFF -DUSE_MINIUPNP=ON -DLOCAL_MINIUPNP=ON -DLUA_SCRIPT=ON -DWITH_LUASCRIPTS=ON -DUSE_JS=ON -DUSE_QT_QML=ON -DUSE_QT_SQLITE=ON -DWITH_SOUNDS=ON -DNO_UI_DAEMON=ON -DJSONRPC_DAEMON=ON -DUSE_CLI_JSONRPC=ON -DPERL_REGEX=ON -DCMAKE_CXX_FLAGS="-I%BOOST_HEADERS_DIR% -I%GETTEXT_HEADERS_DIR% -I%PCRE_HEADERS_DIR%" "%SOURCES_DIR%"
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%" -DSHARE_DIR=resources -DCMAKE_FIND_ROOT_PATH="%MINGW32_DIR%";"%ASPELL_DIR%";"%BOOST_DIR%";"%GETTEXT_DIR%";"%LIBBZ2_DIR%";"%LIBICONV_DIR%";"%LIBIDN_DIR%";"%LIBZ_DIR%";"%LUA_DIR%";"%PCRE_DIR%" -DDO_NOT_USE_MUTEX=ON -DUSE_ASPELL=ON -DDBUS_NOTIFY=OFF -DFORCE_XDG=OFF -DUSE_MINIUPNP=ON -DLOCAL_MINIUPNP=ON -DLUA_SCRIPT=ON -DWITH_LUASCRIPTS=ON -DUSE_JS=ON -DUSE_QT_QML=ON -DUSE_QT_SQLITE=ON -DWITH_SOUNDS=ON -DNO_UI_DAEMON=ON -DJSONRPC_DAEMON=ON -DUSE_CLI_JSONRPC=ON -DPERL_REGEX=ON -DCMAKE_CXX_FLAGS="-I%BOOST_HEADERS_DIR% -I%GETTEXT_HEADERS_DIR% -I%PCRE_HEADERS_DIR%" "%SOURCES_DIR%"
diff --git a/win32/configure.sh b/win32/configure.sh
@@ -2,4 +2,4 @@
 
 . ./variables.sh
 
-cmake -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH=$QT_MINGW32_DIR\;$OPENSSL_DIR\;$ASPELL_DIR\;$BOOST_DIR\;$GETTEXT_DIR\;$LIBBZ2_DIR\;$LIBICONV_DIR\;$LIBIDN_DIR\;$LIBZ_DIR\;$LUA_DIR\;$PCRE_DIR\;$MINGW32_DIR -DCMAKE_C_COMPILER=$C_COMPILER -DCMAKE_CXX_COMPILER=$CXX_COMPILER -DCMAKE_RC_COMPILER=$RC_COMPILER -DCMAKE_CXX_FLAGS="-I$BOOST_HEADERS_DIR -I$GETTEXT_HEADERS_DIR -I$PCRE_HEADERS_DIR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DSHARE_DIR=resources -DUSE_QT=ON -DUSE_ASPELL=ON -DFORCE_XDG=OFF -DDBUS_NOTIFY=OFF -DUSE_JS=ON -DUSE_MINIUPNP=ON -DLOCAL_MINIUPNP=ON -DWITH_SOUNDS=ON -DPERL_REGEX=ON -DUSE_QT_QML=ON -DLUA_SCRIPT=ON -DWITH_LUASCRIPTS=ON -DUSE_QT_SQLITE=ON -DNO_UI_DAEMON=ON -DJSONRPC_DAEMON=ON -DUSE_CLI_JSONRPC=ON $SOURCES_DIR
+cmake -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH=$QT_MINGW32_DIR\;$OPENSSL_DIR\;$ASPELL_DIR\;$BOOST_DIR\;$GETTEXT_DIR\;$LIBBZ2_DIR\;$LIBICONV_DIR\;$LIBIDN_DIR\;$LIBZ_DIR\;$LUA_DIR\;$PCRE_DIR\;$MINGW32_DIR -DCMAKE_C_COMPILER=$C_COMPILER -DCMAKE_CXX_COMPILER=$CXX_COMPILER -DCMAKE_RC_COMPILER=$RC_COMPILER -DCMAKE_CXX_FLAGS="-I$BOOST_HEADERS_DIR -I$GETTEXT_HEADERS_DIR -I$PCRE_HEADERS_DIR" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DSHARE_DIR=resources -DDO_NOT_USE_MUTEX=ON -DUSE_QT=ON -DUSE_ASPELL=ON -DFORCE_XDG=OFF -DDBUS_NOTIFY=OFF -DUSE_JS=ON -DUSE_MINIUPNP=ON -DLOCAL_MINIUPNP=ON -DWITH_SOUNDS=ON -DPERL_REGEX=ON -DUSE_QT_QML=ON -DLUA_SCRIPT=ON -DWITH_LUASCRIPTS=ON -DUSE_QT_SQLITE=ON -DNO_UI_DAEMON=ON -DJSONRPC_DAEMON=ON -DUSE_CLI_JSONRPC=ON $SOURCES_DIR
diff --git a/win32/variables.sh b/win32/variables.sh
@@ -7,7 +7,7 @@ CXX_COMPILER=/usr/bin/$MINGW32_NAME-g++
 RC_COMPILER=/usr/bin/$MINGW32_NAME-windres
 MINGW32_DIR=/usr/$MINGW32_NAME
 
-SOURCES_DIR=/home/$LOGNAME/builds/eiskaltdcpp/eiskaltdcpp
+SOURCES_DIR=/home/$LOGNAME/src/eiskaltdcpp
 MINGW32_DEPENDS_DIR=/home/$LOGNAME/builds/eiskaltdcpp/mingw32-depends
 QT_MINGW32_DIR=/home/$LOGNAME/.wine/drive_c/Qt/4.8.5
 OPENSSL_DIR=/home/$LOGNAME/.wine/drive_c/OpenSSL-Win32