Merge pull request #88 from Armada651/dev

Move all dependencies to the Externals folder.

Author: CrossVR

.gitignore

@@ -9,3 +9,19 @@ intermediate/
 intermediate_plugs/
 lib/
 *.aps
+
+# exclude all third-party libraries
+src/Externals/3dsmax
+src/Externals/BugTrap
+src/Externals/FreeImage
+src/Externals/jpeg
+src/Externals/libogg-1.1.4
+src/Externals/libtheora-1.1.1
+src/Externals/libvorbis-1.2.3
+src/Externals/lightwave
+src/Externals/MagicSoftware
+src/Externals/maya
+src/Externals/nvapi
+src/Externals/OpenAutomate
+src/Externals/OpenSSL
+src/Externals/zlib

doc/howto/build.txt

@@ -2,9 +2,8 @@ TITLE: X-Ray 1.6 build and setup instructions
 
 Build:
 ------
-By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in the directory
-defined by XRAY_16X_LIBS environment variable. It can be set with following command (run as administrator):
-  $ setx XRAY_16X_LIBS E:\dev\ /M
+By default, all libraries mentioned below (except Windows/DirectX SDK) are assumed to be in
+the src\Externals directory.
 
 To build X-Ray Engine you'll need following libraries:
 * OpenSSL: https://www.openssl.org/source
@@ -45,10 +44,10 @@ Setup:
   - eax.dll
   - wrap_oal.dll
 - For _bin_rel and _bin_mix:
-  - Copy BugTrap.dll from %XRAY_16X_LIBS%BugTrap\Bin
+  - Copy BugTrap.dll from src\Externals\BugTrap\Bin
 - For _bin_dbg:
-  - Copy BugTrapD.dll from %XRAY_16X_LIBS%BugTrap\Bin and rename it to BugTrap.dll
-- Copy following files from %XRAY_16X_LIBS%OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
+  - Copy BugTrapD.dll from src\Externals\BugTrap\Bin and rename it to BugTrap.dll
+- Copy following files from src\Externals\OpenSSL\bin to _bin_dbg, _bin_mix and _bin_rel:
   - libeay32.dll
   - ssleay32.dll
 - Create soft link to /gamedata in the game installation directory:

src/3rd party/NVTT/NVTT.vcxproj renamed to src/Externals/NVTT/NVTT.vcxproj

@@ -67,7 +67,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <AdditionalIncludeDirectories>$(XRAY_16X_LIBS);$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>false</MinimalRebuild>
@@ -89,7 +89,7 @@
     <Lib>
       <AdditionalOptions>/ignore:4075 %(AdditionalOptions)</AdditionalOptions>
       <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <AdditionalLibraryDirectories>$(XRAY_16X_LIBS)\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)Externals\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
     </Lib>
@@ -101,7 +101,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(XRAY_16X_LIBS);$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <ExceptionHandling>Sync</ExceptionHandling>
@@ -120,7 +120,7 @@
     </ResourceCompile>
     <Link>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>$(XRAY_16X_LIBS)\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)Externals\jpeg\libraries\Release;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
       <ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
       <GenerateDebugInformation>true</GenerateDebugInformation>