Skip to content

Commit 53b0f96

Browse files
committed
Moved Externals from src
Preparation for merging tamlin's commit
1 parent 9998198 commit 53b0f96

File tree

326 files changed

+45
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+45
-45
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ intermediate/
99
intermediate_plugs/
1010
lib/
1111
*.aps
12+
*.user

.gitmodules

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
[submodule "src/Externals/luabind"]
2-
path = src/Externals/luabind
1+
[submodule "Externals/luabind"]
2+
path = Externals/luabind
33
url = https://github.com/OpenXRay/luabind-deboostified.git
4-
[submodule "src/Externals/luajit"]
5-
path = src/Externals/luajit
4+
[submodule "Externals/luajit"]
5+
path = Externals/luajit
66
url = https://github.com/OpenXRay/LuaJIT.git
7-
[submodule "src/Externals/GameSpy"]
8-
path = src/Externals/GameSpy
7+
[submodule "Externals/GameSpy"]
8+
path = Externals/GameSpy
99
url = https://github.com/nitrocaster/GameSpy.git
10-
[submodule "src/Externals/AGS_SDK"]
11-
path = src/Externals/AGS_SDK
10+
[submodule "Externals/AGS_SDK"]
11+
path = Externals/AGS_SDK
1212
url = https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK.git
13-
[submodule "src/Externals/lzo"]
14-
path = src/Externals/lzo
13+
[submodule "Externals/lzo"]
14+
path = Externals/lzo
1515
url = https://github.com/alexgdi/lzo.git
16-
[submodule "src/Externals/zlib"]
17-
path = src/Externals/zlib
16+
[submodule "Externals/zlib"]
17+
path = Externals/zlib
1818
url = https://github.com/madler/zlib.git
19-
[submodule "src/Externals/libvorbis"]
20-
path = src/Externals/libvorbis
19+
[submodule "Externals/libvorbis"]
20+
path = Externals/libvorbis
2121
url = https://github.com/xiph/vorbis.git
22-
[submodule "src/Externals/libogg"]
23-
path = src/Externals/libogg
22+
[submodule "Externals/libogg"]
23+
path = Externals/libogg
2424
url = https://github.com/xiph/ogg.git
25-
[submodule "src/Externals/libtheora"]
26-
path = src/Externals/libtheora
25+
[submodule "Externals/libtheora"]
26+
path = Externals/libtheora
2727
url = https://github.com/xiph/theora.git
28-
[submodule "src/Externals/jpeg"]
29-
path = src/Externals/jpeg
28+
[submodule "Externals/jpeg"]
29+
path = Externals/jpeg
3030
url = https://github.com/OpenXRay/libjpeg.git
31-
[submodule "src/Externals/BugTrap"]
32-
path = src/Externals/BugTrap
31+
[submodule "Externals/BugTrap"]
32+
path = Externals/BugTrap
3333
url = https://github.com/OpenXRay/BugTrap.git
34-
[submodule "src/Externals/FreeImage"]
35-
path = src/Externals/FreeImage
34+
[submodule "Externals/FreeImage"]
35+
path = Externals/FreeImage
3636
url = https://github.com/OpenXRay/ext-win-freeimage.git
37-
[submodule "src/Externals/cryptopp"]
38-
path = src/Externals/cryptopp
37+
[submodule "Externals/cryptopp"]
38+
path = Externals/cryptopp
3939
url = https://github.com/weidai11/cryptopp.git
40-
[submodule "src/Externals/OpenAutomate"]
41-
path = src/Externals/OpenAutomate
40+
[submodule "Externals/OpenAutomate"]
41+
path = Externals/OpenAutomate
4242
url = https://github.com/OpenXRay/OpenAutomate.git
43-
[submodule "src/Externals/FreeMagic"]
44-
path = src/Externals/FreeMagic
43+
[submodule "Externals/FreeMagic"]
44+
path = Externals/FreeMagic
4545
url = https://github.com/OpenXRay/FreeMagic.git
46-
[submodule "src/Externals/lightwave"]
47-
path = src/Externals/lightwave
46+
[submodule "Externals/lightwave"]
47+
path = Externals/lightwave
4848
url = https://github.com/OpenXRay/LightWave.git
49-
[submodule "src/Externals/3dsmax"]
50-
path = src/Externals/3dsmax
49+
[submodule "Externals/3dsmax"]
50+
path = Externals/3dsmax
5151
url = https://github.com/OpenXRay/3dsmax.git
52-
[submodule "src/Externals/maya"]
53-
path = src/Externals/maya
52+
[submodule "Externals/maya"]
53+
path = Externals/maya
5454
url = https://github.com/OpenXRay/maya.git
55-
[submodule "src/Externals/nvapi"]
56-
path = src/Externals/nvapi
55+
[submodule "Externals/nvapi"]
56+
path = Externals/nvapi
5757
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.

src/Externals/cximage/cximage.vcxproj renamed to Externals/cximage/cximage.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2424
<ConfigurationType>DynamicLibrary</ConfigurationType>
25-
<PlatformToolset>v141</PlatformToolset>
25+
<PlatformToolset>v140</PlatformToolset>
2626
<CharacterSet>MultiByte</CharacterSet>
2727
<WholeProgramOptimization>false</WholeProgramOptimization>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3030
<ConfigurationType>StaticLibrary</ConfigurationType>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v140</PlatformToolset>
3232
<CharacterSet>MultiByte</CharacterSet>
3333
<WholeProgramOptimization>true</WholeProgramOptimization>
3434
</PropertyGroup>
@@ -77,7 +77,7 @@
7777
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
7878
<OmitFramePointers>true</OmitFramePointers>
7979
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
80-
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
80+
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8181
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8282
<StringPooling>true</StringPooling>
8383
<MinimalRebuild>false</MinimalRebuild>
@@ -110,7 +110,7 @@
110110
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
111111
<OmitFramePointers>true</OmitFramePointers>
112112
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
113-
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
113+
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114114
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115115
<StringPooling>true</StringPooling>
116116
<MinimalRebuild>false</MinimalRebuild>
@@ -138,7 +138,7 @@
138138
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
139139
<ClCompile>
140140
<Optimization>Disabled</Optimization>
141-
<AdditionalIncludeDirectories>$(SolutionDir)Externals;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141+
<AdditionalIncludeDirectories>$(xrExternals);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142142
<PreprocessorDefinitions>_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143143
<MinimalRebuild>false</MinimalRebuild>
144144
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
File renamed without changes.

src/Externals/cximage/xfile.h renamed to Externals/cximage/xfile.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
#define __xfile_h
4343

4444
#if defined (WIN32) || defined (_WIN32_WCE)
45-
#define NOMINMAX
46-
#include <windows.h>
45+
#include <windows.h>
4746
#endif
4847

4948
#include <stdio.h>
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.

0 commit comments

Comments
 (0)