Skip to content

Commit

Permalink
Moved Externals from src
Browse files Browse the repository at this point in the history
Preparation for merging tamlin's commit
  • Loading branch information
Xottab-DUTY committed Aug 5, 2017
1 parent 9998198 commit 53b0f96
Show file tree
Hide file tree
Showing 326 changed files with 45 additions and 45 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ intermediate/
intermediate_plugs/
lib/
*.aps
*.user
76 changes: 38 additions & 38 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
[submodule "src/Externals/luabind"]
path = src/Externals/luabind
[submodule "Externals/luabind"]
path = Externals/luabind
url = https://github.com/OpenXRay/luabind-deboostified.git
[submodule "src/Externals/luajit"]
path = src/Externals/luajit
[submodule "Externals/luajit"]
path = Externals/luajit
url = https://github.com/OpenXRay/LuaJIT.git
[submodule "src/Externals/GameSpy"]
path = src/Externals/GameSpy
[submodule "Externals/GameSpy"]
path = Externals/GameSpy
url = https://github.com/nitrocaster/GameSpy.git
[submodule "src/Externals/AGS_SDK"]
path = src/Externals/AGS_SDK
[submodule "Externals/AGS_SDK"]
path = Externals/AGS_SDK
url = https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK.git
[submodule "src/Externals/lzo"]
path = src/Externals/lzo
[submodule "Externals/lzo"]
path = Externals/lzo
url = https://github.com/alexgdi/lzo.git
[submodule "src/Externals/zlib"]
path = src/Externals/zlib
[submodule "Externals/zlib"]
path = Externals/zlib
url = https://github.com/madler/zlib.git
[submodule "src/Externals/libvorbis"]
path = src/Externals/libvorbis
[submodule "Externals/libvorbis"]
path = Externals/libvorbis
url = https://github.com/xiph/vorbis.git
[submodule "src/Externals/libogg"]
path = src/Externals/libogg
[submodule "Externals/libogg"]
path = Externals/libogg
url = https://github.com/xiph/ogg.git
[submodule "src/Externals/libtheora"]
path = src/Externals/libtheora
[submodule "Externals/libtheora"]
path = Externals/libtheora
url = https://github.com/xiph/theora.git
[submodule "src/Externals/jpeg"]
path = src/Externals/jpeg
[submodule "Externals/jpeg"]
path = Externals/jpeg
url = https://github.com/OpenXRay/libjpeg.git
[submodule "src/Externals/BugTrap"]
path = src/Externals/BugTrap
[submodule "Externals/BugTrap"]
path = Externals/BugTrap
url = https://github.com/OpenXRay/BugTrap.git
[submodule "src/Externals/FreeImage"]
path = src/Externals/FreeImage
[submodule "Externals/FreeImage"]
path = Externals/FreeImage
url = https://github.com/OpenXRay/ext-win-freeimage.git
[submodule "src/Externals/cryptopp"]
path = src/Externals/cryptopp
[submodule "Externals/cryptopp"]
path = Externals/cryptopp
url = https://github.com/weidai11/cryptopp.git
[submodule "src/Externals/OpenAutomate"]
path = src/Externals/OpenAutomate
[submodule "Externals/OpenAutomate"]
path = Externals/OpenAutomate
url = https://github.com/OpenXRay/OpenAutomate.git
[submodule "src/Externals/FreeMagic"]
path = src/Externals/FreeMagic
[submodule "Externals/FreeMagic"]
path = Externals/FreeMagic
url = https://github.com/OpenXRay/FreeMagic.git
[submodule "src/Externals/lightwave"]
path = src/Externals/lightwave
[submodule "Externals/lightwave"]
path = Externals/lightwave
url = https://github.com/OpenXRay/LightWave.git
[submodule "src/Externals/3dsmax"]
path = src/Externals/3dsmax
[submodule "Externals/3dsmax"]
path = Externals/3dsmax
url = https://github.com/OpenXRay/3dsmax.git
[submodule "src/Externals/maya"]
path = src/Externals/maya
[submodule "Externals/maya"]
path = Externals/maya
url = https://github.com/OpenXRay/maya.git
[submodule "src/Externals/nvapi"]
path = src/Externals/nvapi
[submodule "Externals/nvapi"]
path = Externals/nvapi
url = https://github.com/OpenXRay/nvapi.git
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
Expand Down Expand Up @@ -77,7 +77,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
Expand Down Expand Up @@ -110,7 +110,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
Expand Down Expand Up @@ -138,7 +138,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions src/Externals/cximage/xfile.h → Externals/cximage/xfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
#define __xfile_h

#if defined (WIN32) || defined (_WIN32_WCE)
#define NOMINMAX
#include <windows.h>
#include <windows.h>
#endif

#include <stdio.h>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 53b0f96

Please sign in to comment.