mirror of https://github.com/BOINC/boinc.git
Additional clean-up
Remove sqlite3.dll from *.ism files Remove sqlite3 as a build dependency Remove sqlite3 from load_dependencies.bat Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura
parent
4322636603
commit
12ef169143
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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' $^ > $@
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
])
|
||||
|
|
@ -1819,7 +1819,6 @@
|
|||
<row><td>placeholder.txt</td><td>_BOINCData</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt1</td><td>_BOINCDataProjects</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>zlib1.dll</td><td>_BOINCDepends</td><td>zlib1.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\zlib1.dll</td><td>1</td><td/></row>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1819,7 +1819,6 @@
|
|||
<row><td>placeholder.txt</td><td>_BOINCData</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt1</td><td>_BOINCDataProjects</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>zlib1.dll</td><td>_BOINCDepends</td><td>zlib1.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\zlib1.dll</td><td>1</td><td/></row>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1819,7 +1819,6 @@
|
|||
<row><td>placeholder.txt</td><td>_BOINCData</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt1</td><td>_BOINCDataProjects</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>zlib1.dll</td><td>_BOINCDepends</td><td>zlib1.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\zlib1.dll</td><td>1</td><td/></row>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1819,7 +1819,6 @@
|
|||
<row><td>placeholder.txt</td><td>_BOINCData</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt1</td><td>_BOINCDataProjects</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>zlib1.dll</td><td>_BOINCDepends</td><td>zlib1.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\zlib1.dll</td><td>1</td><td/></row>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1763,7 +1763,6 @@
|
|||
<row><td>placeholder.txt</td><td>_BOINCData</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt1</td><td>_BOINCDataProjects</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>srcsrv.dll</td><td>_BOINCDepends</td><td>srcsrv.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\srcsrv.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>symsrv.dll</td><td>_BOINCDepends</td><td>symsrv.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\symsrv.dll</td><td>1</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -1766,7 +1766,6 @@
|
|||
<row><td>project.jpg</td><td>_BOINCScreensaver</td><td>project.jpg</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientscr\progress\project.jpg</td><td>1</td><td/></row>
|
||||
<row><td>project_mask.jpg</td><td>_BOINCScreensaver</td><td>PROJEC~1.JPG|project_mask.jpg</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientscr\progress\project_mask.jpg</td><td>1</td><td/></row>
|
||||
<row><td>simt</td><td>_BOINCScreensaver</td><td>simt</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientscr\progress\simt</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ss_config.xml</td><td>_BOINCData</td><td>SS_CON~1.XML|ss_config.xml</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\Progress\ss_config.xml</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>total.jpg</td><td>_BOINCScreensaver</td><td>total.jpg</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientscr\progress\total.jpg</td><td>1</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -1842,7 +1842,6 @@
|
|||
<row><td>placeholder.txt2</td><td>_BOINCDataSlots</td><td>PLACEH~1.TXT|placeholder.txt</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\redist\placeholder.txt</td><td>1</td><td/></row>
|
||||
<row><td>red_dot.png</td><td>_BOINCManagerSkinWCG</td><td>Red_dot.png</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\Red_dot.png</td><td>1</td><td/></row>
|
||||
<row><td>skin.xml</td><td>_BOINCManagerSkinWCG</td><td>skin.xml</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\skin.xml</td><td>1</td><td/></row>
|
||||
<row><td>sqlite3.dll</td><td>_BOINCManager</td><td>sqlite3.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\sqlite3.dll</td><td>1</td><td/></row>
|
||||
<row><td>ssleay32.dll</td><td>_BOINCDepends</td><td>ssleay32.dll</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_RELEASE_FILES>\ssleay32.dll</td><td>1</td><td/></row>
|
||||
<row><td>wcg.ico</td><td>_BOINCManagerSkinWCG</td><td>wcg.ico</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\wcg.ico</td><td>1</td><td/></row>
|
||||
<row><td>wcg_32.png</td><td>_BOINCManagerSkinWCG</td><td>wcg_32.png</td><td>0</td><td/><td/><td/><td>1</td><td><PATH_TO_BOINC_FILES>\clientgui\skins\World Community Grid\wcg_32.png</td><td>1</td><td/></row>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
)
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;wxUSE_GUI=1;wxDEBUG_LEVEL=0;_WCG</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
|
|
@ -140,9 +140,9 @@
|
|||
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<OutputFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb</ProgramDatabaseFile>
|
||||
|
|
@ -163,7 +163,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;NDEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1;wxDEBUG_LEVEL=0</PreprocessorDefinitions>
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Async</ExceptionHandling>
|
||||
|
|
@ -184,9 +184,9 @@
|
|||
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<OutputFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb</ProgramDatabaseFile>
|
||||
|
|
@ -204,7 +204,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1</PreprocessorDefinitions>
|
||||
<StringPooling>false</StringPooling>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
|
|
@ -230,9 +230,9 @@
|
|||
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<OutputFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb</ProgramDatabaseFile>
|
||||
|
|
@ -250,7 +250,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>../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</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_WIN32;_DEBUG;_WINDOWS;_MT;_UNICODE;UNICODE;_WCG;wxUSE_GUI=1</PreprocessorDefinitions>
|
||||
<StringPooling>false</StringPooling>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
|
|
@ -276,9 +276,9 @@
|
|||
<AdditionalIncludeDirectories>..\..\boinc_depends_win_vs2010\wxwidgets\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
</ResourceCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<AdditionalDependencies>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</AdditionalDependencies>
|
||||
<OutputFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;..\..\boinc_depends_win_vs2010\sqlite3\mswin\$(Platform)\$(Configuration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(OutDir);..\..\boinc_depends_win_vs2010\wxwidgets\mswin\$(Platform)\$(Configuration)\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>.\Build\$(Platform)\$(Configuration)\$(ProjectName).pdb</ProgramDatabaseFile>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue