Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- WIN: Make the example graphics application build again. 

- WIN: Get rid of the linker warnings for both the default screensaver and
        the example graphics application

svn path=/trunk/boinc/; revision=25975
This commit is contained in:
Rom Walton 2012-08-03 21:12:49 +00:00
parent 1189951953
commit 1799dd2620
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -5229,3 +5229,12 @@ David 3 Aug 2012
stats.cpp
ssim.cpp
vdad.cpp
Rom 3 Aug 2012
- WIN: Make the example graphics application build again.
- WIN: Get rid of the linker warnings for both the default screensaver and
the example graphics application
win_build/
boinc_ss.vcproj
uc2_graphics.vcproj

8
win_build/boinc_ss.vcproj
View File

@ -54,7 +54,7 @@
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FTGL_LIBRARY_STATIC"
StringPooling="false"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@ -157,7 +157,7 @@
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FTGL_LIBRARY_STATIC"
StringPooling="false"
ExceptionHandling="1"
RuntimeLibrary="0"
@ -259,7 +259,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FTGL_LIBRARY_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@ -359,7 +359,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;_CRT_SECURE_NO_WARNINGS;FTGL_LIBRARY_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"

36
win_build/uc2_graphics.vcproj
View File

@ -52,8 +52,8 @@
Optimization="2"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;FTGL_LIBRARY_STATIC"
StringPooling="false"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@ -81,10 +81,11 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib glu32.lib odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib"
AdditionalDependencies="opengl32.lib glu32.lib odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib freetype2410.lib ftgl_static.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;../../boinc_depends_win_vs2005/freetype/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;;&quot;../../boinc_depends_win_vs2005/ftgl/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="GDI32.DLL;OPENGL32.DLL;GLU32.DLL"
GenerateDebugInformation="true"
@ -153,8 +154,8 @@
Optimization="2"
InlineFunctionExpansion="1"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;NDEBUG;_MT;_CONSOLE;FTGL_LIBRARY_STATIC"
StringPooling="false"
ExceptionHandling="1"
RuntimeLibrary="0"
@ -183,10 +184,11 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib glu32.lib odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib"
AdditionalDependencies="opengl32.lib glu32.lib odbc32.lib odbccp32.lib libcmt.lib libcpmt.lib freetype2410.lib ftgl_static.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;../../boinc_depends_win_vs2005/freetype/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;;&quot;../../boinc_depends_win_vs2005/ftgl/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="GDI32.DLL;OPENGL32.DLL;GLU32.DLL"
GenerateDebugInformation="true"
@ -253,8 +255,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;FTGL_LIBRARY_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@ -281,10 +283,11 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;../../boinc_depends_win_vs2005/freetype/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;;&quot;../../boinc_depends_win_vs2005/ftgl/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="GDI32.DLL;OPENGL32.DLL;GLU32.DLL"
GenerateDebugInformation="true"
@ -351,8 +354,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE"
AdditionalIncludeDirectories=".;..;../api;../lib;../samples/image_libs;../samples/jpeglib;../samples/glut;../coprocs/OpenCL/include;../../boinc_depends_win_vs2005/freetype/include;../../boinc_depends_win_vs2005/ftgl/include"
PreprocessorDefinitions="WIN32;_DEBUG;_MT;_CONSOLE;FTGL_LIBRARY_STATIC"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@ -379,10 +382,11 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib"
AdditionalDependencies="libcmtd.lib libcpmtd.lib kernel32.lib user32.lib gdi32.lib opengl32.lib glu32.lib ole32.lib delayimp.lib freetype2410_D.lib ftgl_static_D.lib"
OutputFile=".\Build\$(PlatformName)\$(ConfigurationName)\$(ProjectName).exe"
LinkIncremental="0"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;../../boinc_depends_win_vs2005/freetype/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;;&quot;../../boinc_depends_win_vs2005/ftgl/mswin/$(PlatformName)/$(ConfigurationName)/lib&quot;"
IgnoreAllDefaultLibraries="true"
DelayLoadDLLs="GDI32.DLL;OPENGL32.DLL;GLU32.DLL"
GenerateDebugInformation="true"
@ -423,6 +427,10 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\api\ttfont.cpp"
>
</File>
<File
RelativePath="..\samples\example_app\uc2_graphics.cpp"
>
@ -437,6 +445,10 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\api\ttfont.h"
>
</File>
<File
RelativePath="..\samples\example_app\uc2.h"
>