diff --git a/.travis.yml b/.travis.yml index 6dc45ae887..19651993d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ jobs: before_install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then ( sudo apt-get -qq update ) fi - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then ( sudo apt-get install -y freeglut3-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libsqlite3-dev libgtk2.0-dev libwebkitgtk-dev mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 realpath p7zip-full ) fi + - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then ( sudo apt-get install -y freeglut3-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk2.0-dev libwebkitgtk-dev mingw-w64 binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 gcc-mingw-w64 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 realpath p7zip-full ) fi - if [[ "${BOINC_TYPE}" == "integration-test" ]]; then ( sudo apt-get install ansible/xenial-backports; sudo service mysql stop; ) fi before_script: diff --git a/clientgui/Makefile.am b/clientgui/Makefile.am index 8309a3227e..215a53654a 100644 --- a/clientgui/Makefile.am +++ b/clientgui/Makefile.am @@ -101,9 +101,9 @@ EXTRA_DIST = *.h \ ../lib/error_numbers.h \ locale -boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS) -boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS) -boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS) +boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS) +boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK_CFLAGS) +boincmgr_LDADD = $(LIBBOINC) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK_LIBS) win_config.h: $(top_srcdir)/config.h grep '#define.*BOINC.*VERSION' $^ > $@ diff --git a/m4/sqlite3.m4 b/m4/sqlite3.m4 deleted file mode 100644 index 0498d1c480..0000000000 --- a/m4/sqlite3.m4 +++ /dev/null @@ -1,55 +0,0 @@ -AC_DEFUN([AM_PATH_SQLITE3], -[ -AC_ARG_WITH([sqlite3-prefix], - [ --with-sqlite3-prefix=PREFIX Prefix where SQLite3 installed (optional)], - [sqlite3_prefix=$withval], - [sqlite3_prefix=""]) - -if test "x$sqlite3_prefix" = "x"; then - sqlite3_prefix="/usr" -fi - -LIBS_save=$LIBS -CPPFLAGS_save=$CPPFLAGS - -PKG_CONFIG="$sqlite3_prefix/bin/pkg-config" -if test -x $PKG_CONFIG; then - AC_MSG_CHECKING([checking availability of sqlite3 using pkg-config]) - $PKG_CONFIG --exists sqlite3 - if test "$?" = "0"; then - # Use pkg-config to detect LIBS and CFLAGS - SQLITE3_LIBS=`$PKG_CONFIG --libs sqlite3` - SQLITE3_CFLAGS=`$PKG_CONFIG --cflags sqlite3` - - LIBS="$SQLITE3_LIBS $LIBS" - CPPFLAGS="$SQLITE3_CFLAGS $CPPFLAGS" - have_sqlite3=yes - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -fi -if test "x$have_sqlite3" != "xyes"; then - sqlite3_prefix_lib=$sqlite3_prefix/lib - sqlite3_prefix_include=$sqlite3_prefix/include - - LIBS="-L$sqlite3_prefix_lib $LIBS" - CPPFLAGS="-I$sqlite3_prefix_include $CPPFLAGS" - - AC_CHECK_LIB([sqlite3], [sqlite3_open], [have_sqlite3=yes]) - if test "x$have_sqlite3" = "xyes"; then - SQLITE3_LIBS="-L$sqlite3_prefix_lib -lsqlite3" - SQLITE3_CPPFLAGS="-I$sqlite3_prefix_include" - fi -fi -if test "x$have_sqlite3" = "xyes"; then - AC_CHECK_FUNCS([sqlite3_open]) - AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.]) - AC_SUBST(SQLITE3_LIBS) - AC_SUBST(SQLITE3_CPPFLAGS) -fi - -LIBS=$LIBS_save -CPPFLAGS=$CPPFLAGS_save - -]) diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index 5c2d945dd9..01e273f390 100644 --- a/win_build/installerv2/BOINC.ism +++ b/win_build/installerv2/BOINC.ism @@ -1819,7 +1819,6 @@ placeholder.txt_BOINCDataPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt1_BOINCDataProjectsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 zlib1.dll_BOINCDependszlib1.dll01<PATH_TO_RELEASE_FILES>\zlib1.dll1 diff --git a/win_build/installerv2/BOINC_vbox.ism b/win_build/installerv2/BOINC_vbox.ism index a59e6e97ae..9874cc42e4 100644 --- a/win_build/installerv2/BOINC_vbox.ism +++ b/win_build/installerv2/BOINC_vbox.ism @@ -1819,7 +1819,6 @@ placeholder.txt_BOINCDataPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt1_BOINCDataProjectsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 zlib1.dll_BOINCDependszlib1.dll01<PATH_TO_RELEASE_FILES>\zlib1.dll1 diff --git a/win_build/installerv2/BOINCx64.ism b/win_build/installerv2/BOINCx64.ism index 0442ef6c2c..245f27a3c2 100644 --- a/win_build/installerv2/BOINCx64.ism +++ b/win_build/installerv2/BOINCx64.ism @@ -1819,7 +1819,6 @@ placeholder.txt_BOINCDataPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt1_BOINCDataProjectsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 zlib1.dll_BOINCDependszlib1.dll01<PATH_TO_RELEASE_FILES>\zlib1.dll1 diff --git a/win_build/installerv2/BOINCx64_vbox.ism b/win_build/installerv2/BOINCx64_vbox.ism index d2fd6f5daa..bde9eed596 100644 --- a/win_build/installerv2/BOINCx64_vbox.ism +++ b/win_build/installerv2/BOINCx64_vbox.ism @@ -1819,7 +1819,6 @@ placeholder.txt_BOINCDataPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt1_BOINCDataProjectsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 zlib1.dll_BOINCDependszlib1.dll01<PATH_TO_RELEASE_FILES>\zlib1.dll1 diff --git a/win_build/installerv2/CharityEngine.ism b/win_build/installerv2/CharityEngine.ism index a2d38f75e0..c2fdd6d50c 100644 --- a/win_build/installerv2/CharityEngine.ism +++ b/win_build/installerv2/CharityEngine.ism @@ -1763,7 +1763,6 @@ placeholder.txt_BOINCDataPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt1_BOINCDataProjectsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 srcsrv.dll_BOINCDependssrcsrv.dll01<PATH_TO_RELEASE_FILES>\srcsrv.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 symsrv.dll_BOINCDependssymsrv.dll01<PATH_TO_RELEASE_FILES>\symsrv.dll1 diff --git a/win_build/installerv2/Progress.ism b/win_build/installerv2/Progress.ism index 31fa254bc8..3efdadffc9 100644 --- a/win_build/installerv2/Progress.ism +++ b/win_build/installerv2/Progress.ism @@ -1766,7 +1766,6 @@ project.jpg_BOINCScreensaverproject.jpg01<PATH_TO_BOINC_FILES>\clientscr\progress\project.jpg1 project_mask.jpg_BOINCScreensaverPROJEC~1.JPG|project_mask.jpg01<PATH_TO_BOINC_FILES>\clientscr\progress\project_mask.jpg1 simt_BOINCScreensaversimt01<PATH_TO_BOINC_FILES>\clientscr\progress\simt1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ss_config.xml_BOINCDataSS_CON~1.XML|ss_config.xml01<ISProjectFolder>\redist\Progress\ss_config.xml1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 total.jpg_BOINCScreensavertotal.jpg01<PATH_TO_BOINC_FILES>\clientscr\progress\total.jpg1 diff --git a/win_build/installerv2/WCG.ism b/win_build/installerv2/WCG.ism index a4e34e7cf7..92b6da5eea 100644 --- a/win_build/installerv2/WCG.ism +++ b/win_build/installerv2/WCG.ism @@ -1842,7 +1842,6 @@ placeholder.txt2_BOINCDataSlotsPLACEH~1.TXT|placeholder.txt01<ISProjectFolder>\redist\placeholder.txt1 red_dot.png_BOINCManagerSkinWCGRed_dot.png01<PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\Red_dot.png1 skin.xml_BOINCManagerSkinWCGskin.xml01<PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\skin.xml1 - sqlite3.dll_BOINCManagersqlite3.dll01<PATH_TO_RELEASE_FILES>\sqlite3.dll1 ssleay32.dll_BOINCDependsssleay32.dll01<PATH_TO_RELEASE_FILES>\ssleay32.dll1 wcg.ico_BOINCManagerSkinWCGwcg.ico01<PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\wcg.ico1 wcg_32.png_BOINCManagerSkinWCGwcg_32.png01<PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\wcg_32.png1 diff --git a/win_build/load_dependencies.bat b/win_build/load_dependencies.bat index babe979d92..d6b38612fe 100644 --- a/win_build/load_dependencies.bat +++ b/win_build/load_dependencies.bat @@ -30,12 +30,14 @@ curl %dependencies_zip_path% --output %TEMP%\boinc_depends_win_vs2013.zip rd /s /q %dependencies_path%\.git +REM Clean all sqlite3 as it's not use anymore +rd /s /q %dependencies_path%\sqlite3\ + if "%platform%" == "Win32" ( rd /s /q %dependencies_path%\curl\mswin\x64 rd /s /q %dependencies_path%\freetype\mswin\x64 rd /s /q %dependencies_path%\ftgl\mswin\x64 rd /s /q %dependencies_path%\openssl\mswin\x64 - rd /s /q %dependencies_path%\sqlite3\mswin\x64 rd /s /q %dependencies_path%\wxwidgets\mswin\x64 rd /s /q %dependencies_path%\zlib\mswin\x64 ) else ( @@ -43,7 +45,6 @@ if "%platform%" == "Win32" ( rd /s /q %dependencies_path%\freetype\mswin\Win32 rd /s /q %dependencies_path%\ftgl\mswin\Win32 rd /s /q %dependencies_path%\openssl\mswin\Win32 - rd /s /q %dependencies_path%\sqlite3\mswin\Win32 rd /s /q %dependencies_path%\wxwidgets\mswin\Win32 rd /s /q %dependencies_path%\zlib\mswin\Win32 ) @@ -53,7 +54,6 @@ if "%configuration%" == "Debug" ( rd /s /q %dependencies_path%\freetype\mswin\%platform%\Release rd /s /q %dependencies_path%\ftgl\mswin\%platform%\Release rd /s /q %dependencies_path%\openssl\mswin\%platform%\Release - rd /s /q %dependencies_path%\sqlite3\mswin\%platform%\Release rd /s /q %dependencies_path%\wxwidgets\mswin\%platform%\Release rd /s /q %dependencies_path%\zlib\mswin\%platform%\Release ) else ( @@ -61,7 +61,6 @@ if "%configuration%" == "Debug" ( rd /s /q %dependencies_path%\freetype\mswin\%platform%\Debug rd /s /q %dependencies_path%\ftgl\mswin\%platform%\Debug rd /s /q %dependencies_path%\openssl\mswin\%platform%\Debug - rd /s /q %dependencies_path%\sqlite3\mswin\%platform%\Debug rd /s /q %dependencies_path%\wxwidgets\mswin\%platform%\Debug rd /s /q %dependencies_path%\zlib\mswin\%platform%\Debug ) diff --git a/win_build/wcg_boincmgr.vcxproj b/win_build/wcg_boincmgr.vcxproj index a39115aa32..1529c6e71b 100644 --- a/win_build/wcg_boincmgr.vcxproj +++ b/win_build/wcg_boincmgr.vcxproj @@ -119,7 +119,7 @@ MaxSpeed - ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswu;..\..\boinc_depends_win_vs2010\sqlite3\include;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include + ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswu;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include WIN32;_WIN32;NDEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;wxUSE_GUI=1;wxDEBUG_LEVEL=0;_WCG true Async @@ -140,9 +140,9 @@ ..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories) - MSVCRT.LIB;MSVCPRT.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;oleacc.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxmsw30u_qa.lib;wxmsw30u_webview.lib;wxregexu.lib;wxexpat.lib;wxpng.lib;wxjpeg.lib;wxtiff.lib;wxzlib.lib;sqlite3.lib + MSVCRT.LIB;MSVCPRT.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;oleacc.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxmsw30u_qa.lib;wxmsw30u_webview.lib;wxregexu.lib;wxexpat.lib;wxpng.lib;wxjpeg.lib;wxtiff.lib;wxzlib.lib .\Build\$(Platform)\$(Configuration)\$(ProjectName).exe - $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories) true true .\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb @@ -163,7 +163,7 @@ MaxSpeed - ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswu;..\..\boinc_depends_win_vs2010\sqlite3\include;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include + ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswu;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include WIN32;_WIN32;NDEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1;wxDEBUG_LEVEL=0 true Async @@ -184,9 +184,9 @@ ..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories) - MSVCRT.LIB;MSVCPRT.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleacc.lib;oleaut32.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxmsw30u_qa.lib;wxmsw30u_webview.lib;wxregexu.lib;wxexpat.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;sqlite3.lib + MSVCRT.LIB;MSVCPRT.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleacc.lib;oleaut32.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30u.lib;wxbase30u_net.lib;wxbase30u_xml.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxmsw30u_qa.lib;wxmsw30u_webview.lib;wxregexu.lib;wxexpat.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib .\Build\$(Platform)\$(Configuration)\$(ProjectName).exe - $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories) true true .\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb @@ -204,7 +204,7 @@ Disabled - ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswud;..\..\boinc_depends_win_vs2010\sqlite3\include;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include + ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswud;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include WIN32;_WIN32;_DEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1 false false @@ -230,9 +230,9 @@ ..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories) - MSVCRTD.LIB;MSVCPRTD.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleacc.lib;oleaut32.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_qa.lib;wxmsw30ud_webview.lib;wxregexud.lib;wxexpatd.lib;wxjpegd.lib;wxtiffd.lib;wxpngd.lib;wxzlibd.lib;sqlite3.lib + MSVCRTD.LIB;MSVCPRTD.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleacc.lib;oleaut32.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_qa.lib;wxmsw30ud_webview.lib;wxregexud.lib;wxexpatd.lib;wxjpegd.lib;wxtiffd.lib;wxpngd.lib;wxzlibd.lib .\Build\$(Platform)\$(Configuration)\$(ProjectName).exe - $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories) true true .\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb @@ -250,7 +250,7 @@ Disabled - ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswud;..\..\boinc_depends_win_vs2010\sqlite3\include;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include + ../win_build;..;..\..\boinc_depends_win_vs2010\wxwidgets\include;..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib\mswud;..\lib;..\api;..\clientgui;..\client\win;../coprocs/OpenCL/include WIN32;_WIN32;_DEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1 false false @@ -276,9 +276,9 @@ ..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories) - MSVCRTD.LIB;MSVCPRTD.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;oleacc.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_qa.lib;wxmsw30ud_webview.lib;wxregexud.lib;wxexpatd.lib;wxpngd.lib;wxtiffd.lib;wxjpegd.lib;wxzlibd.lib;sqlite3.lib + MSVCRTD.LIB;MSVCPRTD.LIB;kernel32.lib;user32.lib;gdi32.lib;ole32.lib;oleaut32.lib;oleacc.lib;shell32.lib;comdlg32.lib;advapi32.lib;oldnames.lib;uuid.lib;rpcrt4.lib;comctl32.lib;wsock32.lib;wininet.lib;userenv.lib;winspool.lib;wxbase30ud.lib;wxbase30ud_net.lib;wxbase30ud_xml.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_qa.lib;wxmsw30ud_webview.lib;wxregexud.lib;wxexpatd.lib;wxpngd.lib;wxtiffd.lib;wxjpegd.lib;wxzlibd.lib .\Build\$(Platform)\$(Configuration)\$(ProjectName).exe - $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories) + $(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories) true true .\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb diff --git a/xcompile/xcompile.MinGW32_on_cygwin.sh b/xcompile/xcompile.MinGW32_on_cygwin.sh index 6d767eb5bd..59ba14850b 100755 --- a/xcompile/xcompile.MinGW32_on_cygwin.sh +++ b/xcompile/xcompile.MinGW32_on_cygwin.sh @@ -176,25 +176,6 @@ if test $build_manager != no ; then fi fi -if test $build_manager != no ; then - if ! test -f ${XCOMPILE_ROOT}/lib/libsqlite3.a ; then - sqlite_year=2014 - sqlite_ver=3080403 - filename=sqlite-autoconf-${sqlite_ver}.tar.gz - wget http://www.sqlite.org/${sqlite_year}/$filename - tar zxf $filename - cd sqlite-autoconf-${sqlite_ver} - ./configure -C --host=$TARGET_HOST --build=$BUILD_HOST --prefix=${XCOMPILE_ROOT} --with-sysroot=${XCOMPILE_ROOT} - make all - make install - cd .. - /bin/rm -f $filename - /bin/rm -rf sqlite-autoconf-${sqlite_ver} - fi -fi - - - if test $build_manager != no -o $build_libs != no ; then if ! test -f ${XCOMPILE_ROOT}/include/GL/glut.h -a -f ${XCOMPILE_ROOT}/lib/libfreeglut_static.a ; then svn co http://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut freeglut