diff options
| author | Ezhik452 <> | 2010-01-13 10:41:37 +0000 |
|---|---|---|
| committer | Ezhik452 <> | 2010-01-13 10:41:37 +0000 |
| commit | 3a6c35a751df0d70579fa5512ae99af169ba48ba (patch) | |
| tree | 738fcbe7ab53ff38d2d9e5e42b46131f7c9db47c | |
| parent | 14801941e74aa9ffe29ee6c4e144c4b3f3776286 (diff) | |
minor changes. Ready to build any timestellarium-0.8-itlab-unn
| -rw-r--r-- | Build/Debug/highgui100.dll | bin | 0 -> 626741 bytes | |||
| -rw-r--r-- | stellarium/SDL/SDL.vcproj | 3 | ||||
| -rw-r--r-- | stellarium/stellarium/stellarium.vcproj | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Build/Debug/highgui100.dll b/Build/Debug/highgui100.dll Binary files differnew file mode 100644 index 0000000000..a480999a61 --- /dev/null +++ b/Build/Debug/highgui100.dll diff --git a/stellarium/SDL/SDL.vcproj b/stellarium/SDL/SDL.vcproj index 6682d1f0bf..ec66354c17 100644 --- a/stellarium/SDL/SDL.vcproj +++ b/stellarium/SDL/SDL.vcproj @@ -145,7 +145,7 @@ Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="false"
- AdditionalIncludeDirectories=""..\..\SDL-1.2.11\include";..\..\libiconv\src"
+ AdditionalIncludeDirectories=""..\..\SDL-1.2.11\include";..\..\libiconv\src;..\..\include\dx_sdk"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0400"
StringPooling="true"
RuntimeLibrary="0"
@@ -179,6 +179,7 @@ OutputFile="$(OutDir)/SDL.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="..\..\lib"
IgnoreAllDefaultLibraries="false"
ProgramDatabaseFile="$(OutDir)/SDL.pdb"
SubSystem="2"
diff --git a/stellarium/stellarium/stellarium.vcproj b/stellarium/stellarium/stellarium.vcproj index 7f1d7f183d..c06640f0b5 100644 --- a/stellarium/stellarium/stellarium.vcproj +++ b/stellarium/stellarium/stellarium.vcproj @@ -112,7 +112,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\include\glew;"..\..\SDL_image-1.2.6";"..\..\lib3ds-1.3.0";..\..\include;"..\..\stellarium-0.8.2";..\..\libiconv\src;"..\..\stellarium-0.8.2\src";"..\..\stellarium-0.8.2\src\stellastro";"..\..\stellarium-0.8.2\src\glpng";"..\..\stellarium-0.8.2\src\iniparser";"..\..\stellarium-0.8.2\src\stellplanet";..\..\lpng1212;..\..\ZLib;"..\..\freetype-2.1.10\include";"..\..\SDL-1.2.11\include";..\..\gettext\src"
+ AdditionalIncludeDirectories="..\..\include\glew;"..\..\SDL_image-1.2.6";"..\..\lib3ds-1.3.0";..\..\include;"..\..\stellarium-0.8.2";..\..\libiconv\src;"..\..\stellarium-0.8.2\src";"..\..\stellarium-0.8.2\src\stellastro";"..\..\stellarium-0.8.2\src\glpng";"..\..\stellarium-0.8.2\src\iniparser";"..\..\stellarium-0.8.2\src\stellplanet";..\..\lpng1212;..\..\ZLib;"..\..\freetype-2.1.10\include";"..\..\SDL-1.2.11\include";..\..\gettext\src;..\..\include\openCV"
PreprocessorDefinitions="WIN32;_NDEBUG;_WINDOWS;__MSVC__;_WIN32_WINNT=0x0400;_USE_MATH_DEFINES"
RuntimeLibrary="0"
DisableSpecificWarnings="4996"
@@ -129,7 +129,7 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL_image.lib glaux.lib lib3ds-1_3.lib glew32.lib glut32.lib libpng.lib freetype2110MT.lib Opengl32.lib Ws2_32.lib Glu32.lib highgui.lib cxcore.lib cv.lib gettext.lib libcharset.lib libiconv.lib shell32.lib user32.lib"
- AdditionalLibraryDirectories="..\..\Build\lib3ds_release;..\..\Build\SDL_image_release;..\..\lib\release;..\..\Build\freetype_release;..\..\Build\lpng_release;..\..\Build\zlib_release;..\..\Build\SDL_release;..\..\Build\Release\gettext;..\..\Build\Release\libcharset;..\..\Build\Release\libiconv"
+ AdditionalLibraryDirectories="..\..\Build\lib3ds_release;..\..\Build\SDL_image_release;..\..\lib\release;..\..\Build\freetype_release;..\..\Build\lpng_release;..\..\Build\zlib_release;..\..\Build\SDL_release;..\..\Build\Release\gettext;..\..\Build\Release\libcharset;..\..\Build\Release\libiconv;..\..\lib"
SubSystem="2"
/>
<Tool
|