Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve build system #160

Merged
merged 23 commits into from
Apr 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2716fcd
engine: Don't build editor projects.
CrossVR Jan 23, 2017
223a0d2
Add luajit project to solution.
CrossVR Jan 27, 2017
6b92cf9
Add zlib as a submodule
CrossVR Jan 27, 2017
6db3da6
Add xiph codecs as submodules.
CrossVR Jan 28, 2017
6cbf9e4
Externals: Always use Multi-Threaded DLL runtime.
CrossVR Jan 28, 2017
48d8d95
Add libjpeg as a submodule
CrossVR Jan 28, 2017
1db2766
Common.props: Add OutDir for Makefile projects.
CrossVR Jan 28, 2017
1b33e20
Externals: Don't specify debug information properties in projects.
CrossVR Jan 28, 2017
6d9ea83
Add BugTrap as a submodule
CrossVR Jan 28, 2017
e427ada
Externals: Update luajit module.
CrossVR Feb 26, 2017
f024821
Add FreeImage as a binary submodule.
CrossVR Mar 7, 2017
befe41d
BugTrap: Output the import library to lib.
CrossVR Mar 7, 2017
9a47507
Update luajit submodule.
CrossVR Mar 8, 2017
7f8af89
Crypto: Replace OpenSSL with Crypto++
CrossVR Mar 8, 2017
37222db
Add FreeMagic as a submodule.
CrossVR Mar 8, 2017
5631727
Add OpenAutomate as a submodule.
CrossVR Mar 8, 2017
5f5e4f7
Add submodules for 3dsmax, lightwave, maya and nvapi.
CrossVR Mar 9, 2017
82212e4
Remove references to library directories that no longer exist.
CrossVR Mar 9, 2017
143f4c2
Fix LuaJIT project references.
CrossVR Mar 9, 2017
899639a
Update luabind submodule.
CrossVR Mar 9, 2017
ba55395
Externals: Switch to a static build of Crypto++ 5.6.5.
CrossVR Mar 10, 2017
cc2f94a
engine: Delete Mixed Platforms configuration.
CrossVR Mar 10, 2017
ae32637
Externals: Fix zlib project configuration.
CrossVR Mar 30, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,45 @@
[submodule "src/Externals/lzo"]
path = src/Externals/lzo
url = https://github.com/alexgdi/lzo.git
[submodule "src/Externals/zlib"]
path = src/Externals/zlib
url = https://github.com/madler/zlib.git
[submodule "src/Externals/libvorbis"]
path = src/Externals/libvorbis
url = https://github.com/xiph/vorbis.git
[submodule "src/Externals/libogg"]
path = src/Externals/libogg
url = https://github.com/xiph/ogg.git
[submodule "src/Externals/libtheora"]
path = src/Externals/libtheora
url = https://github.com/xiph/theora.git
[submodule "src/Externals/jpeg"]
path = src/Externals/jpeg
url = https://github.com/OpenXRay/libjpeg.git
[submodule "src/Externals/BugTrap"]
path = src/Externals/BugTrap
url = https://github.com/OpenXRay/BugTrap.git
[submodule "src/Externals/FreeImage"]
path = src/Externals/FreeImage
url = https://github.com/OpenXRay/ext-win-freeimage.git
[submodule "src/Externals/cryptopp"]
path = src/Externals/cryptopp
url = https://github.com/weidai11/cryptopp.git
[submodule "src/Externals/OpenAutomate"]
path = src/Externals/OpenAutomate
url = https://github.com/OpenXRay/OpenAutomate.git
[submodule "src/Externals/FreeMagic"]
path = src/Externals/FreeMagic
url = https://github.com/OpenXRay/FreeMagic.git
[submodule "src/Externals/lightwave"]
path = src/Externals/lightwave
url = https://github.com/OpenXRay/LightWave.git
[submodule "src/Externals/3dsmax"]
path = src/Externals/3dsmax
url = https://github.com/OpenXRay/3dsmax.git
[submodule "src/Externals/maya"]
path = src/Externals/maya
url = https://github.com/OpenXRay/maya.git
[submodule "src/Externals/nvapi"]
path = src/Externals/nvapi
url = https://github.com/OpenXRay/nvapi.git
5 changes: 4 additions & 1 deletion src/Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@
<PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
<OutDir>$(xrLibDir)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(ConfigurationType)'=='Makefile'">
<OutDir>$(xrLibDir)</OutDir>
</PropertyGroup>
<PropertyGroup>
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);$(xrSdkDir)include;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;$(SolutionDir)Externals\GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);$(xrSdkDir)include;$(SolutionDir)Externals;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;$(SolutionDir)Externals\GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<!--
4251 : class 'x' needs to have dll-interface to be used by clients of class 'y'
Expand Down
15 changes: 0 additions & 15 deletions src/Externals/.gitignore

This file was deleted.

1 change: 1 addition & 0 deletions src/Externals/3dsmax
Submodule 3dsmax added at 2a5cbb
1 change: 1 addition & 0 deletions src/Externals/BugTrap
Submodule BugTrap added at c75d4e
373 changes: 373 additions & 0 deletions src/Externals/BugTrap.vcxproj

Large diffs are not rendered by default.

Loading