1.1 --- a/prototype/prototype.vcxproj	Sun Oct 07 02:05:11 2012 +0300
     1.2 +++ b/prototype/prototype.vcxproj	Sun Oct 07 03:42:44 2012 +0200
     1.3 @@ -52,13 +52,13 @@
     1.4        <WarningLevel>Level3</WarningLevel>
     1.5        <Optimization>Disabled</Optimization>
     1.6        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     1.7 -      <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     1.8 -      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     1.9 +      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;$(SolutionDir)\imago2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.10 +      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
    1.11      </ClCompile>
    1.12      <Link>
    1.13        <SubSystem>Console</SubSystem>
    1.14        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.15 -      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.16 +      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;zlib.lib;jpeglib.lib;libpng.lib;freetype.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.17      </Link>
    1.18    </ItemDefinitionGroup>
    1.19    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    1.20 @@ -70,22 +70,39 @@
    1.21        <FunctionLevelLinking>true</FunctionLevelLinking>
    1.22        <IntrinsicFunctions>true</IntrinsicFunctions>
    1.23        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.24 -      <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.25 -      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    1.26 +      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;$(SolutionDir)\imago2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.27 +      <DisableSpecificWarnings>4996;4244</DisableSpecificWarnings>
    1.28      </ClCompile>
    1.29      <Link>
    1.30        <SubSystem>Console</SubSystem>
    1.31        <GenerateDebugInformation>true</GenerateDebugInformation>
    1.32        <EnableCOMDATFolding>true</EnableCOMDATFolding>
    1.33        <OptimizeReferences>true</OptimizeReferences>
    1.34 -      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.35 +      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;zlib.lib;jpeglib.lib;libpng.lib;freetype.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    1.36      </Link>
    1.37    </ItemDefinitionGroup>
    1.38    <ItemGroup>
    1.39 +    <ClCompile Include="anim\anim.c" />
    1.40 +    <ClCompile Include="anim\dynarr.c" />
    1.41 +    <ClCompile Include="anim\track.c" />
    1.42      <ClCompile Include="drawtext\drawgl.c" />
    1.43      <ClCompile Include="drawtext\font.c" />
    1.44      <ClCompile Include="drawtext\utf8.c" />
    1.45 +    <ClCompile Include="imago2\conv.c" />
    1.46 +    <ClCompile Include="imago2\file_jpeg.c" />
    1.47 +    <ClCompile Include="imago2\file_png.c" />
    1.48 +    <ClCompile Include="imago2\file_ppm.c" />
    1.49 +    <ClCompile Include="imago2\file_rgbe.c" />
    1.50 +    <ClCompile Include="imago2\ftype_module.c" />
    1.51 +    <ClCompile Include="imago2\imago2.c" />
    1.52 +    <ClCompile Include="imago2\imago_gl.c" />
    1.53 +    <ClCompile Include="imago2\modules.c" />
    1.54      <ClCompile Include="kdtree\kdtree.c" />
    1.55 +    <ClCompile Include="psys\pattr.c" />
    1.56 +    <ClCompile Include="psys\pstrack.c" />
    1.57 +    <ClCompile Include="psys\psys.c" />
    1.58 +    <ClCompile Include="psys\psys_gl.c" />
    1.59 +    <ClCompile Include="psys\rndval.c" />
    1.60      <ClCompile Include="src\audio\audio.cc" />
    1.61      <ClCompile Include="src\audio\auman.cc" />
    1.62      <ClCompile Include="src\audio\ovstream.cc" />
    1.63 @@ -124,9 +141,20 @@
    1.64      <ClCompile Include="vmath\vmath.c" />
    1.65    </ItemGroup>
    1.66    <ItemGroup>
    1.67 +    <ClInclude Include="anim\anim.h" />
    1.68 +    <ClInclude Include="anim\config.h" />
    1.69 +    <ClInclude Include="anim\dynarr.h" />
    1.70 +    <ClInclude Include="anim\track.h" />
    1.71      <ClInclude Include="drawtext\drawtext.h" />
    1.72      <ClInclude Include="drawtext\drawtext_impl.h" />
    1.73 +    <ClInclude Include="imago2\ftype_module.h" />
    1.74 +    <ClInclude Include="imago2\imago2.h" />
    1.75      <ClInclude Include="kdtree\kdtree.h" />
    1.76 +    <ClInclude Include="psys\pattr.h" />
    1.77 +    <ClInclude Include="psys\pstrack.h" />
    1.78 +    <ClInclude Include="psys\psys.h" />
    1.79 +    <ClInclude Include="psys\psys_gl.h" />
    1.80 +    <ClInclude Include="psys\rndval.h" />
    1.81      <ClInclude Include="src\audio\audio.h" />
    1.82      <ClInclude Include="src\audio\auman.h" />
    1.83      <ClInclude Include="src\audio\openal.h" />