Browse Source

Moved dependencies into their own folder

* This cleans up the repository a lot, and makes it better in the future
as well.
* I also added proper cleaning for Horde3D in CleanAll.sh
* Don't clean processed assets for now
ModuleMoving
Macoy Madson 1 year ago
parent
commit
7823d234df
12 changed files with 37 additions and 26 deletions
  1. +6
    -6
      .gitmodules
  2. +3
    -3
      BuildDependencies.sh
  3. +1
    -1
      BuildDependencies_Debug.sh
  4. +5
    -2
      CleanAll.sh
  5. +0
    -0
      Dependencies/Horde3D
  6. +0
    -0
      Dependencies/base2.0
  7. +0
    -0
      Dependencies/bullet3
  8. +0
    -0
      Dependencies/glm
  9. +0
    -0
      Dependencies/tinygltf
  10. +0
    -0
      Dependencies/tinyobjloader
  11. +21
    -13
      Jamrules
  12. +1
    -1
      build_cmake_pybullet_double_debug.sh

+ 6
- 6
.gitmodules View File

@ -1,18 +1,18 @@
[submodule "bullet3"]
path = bullet3
path = Dependencies/bullet3
url = https://github.com/bulletphysics/bullet3
[submodule "base2.0"]
path = base2.0
path = Dependencies/base2.0
url = https://github.com/makuto/base2.0
[submodule "tinygltf"]
path = tinygltf
path = Dependencies/tinygltf
url = https://github.com/syoyo/tinygltf.git
[submodule "Horde3D"]
path = Horde3D
path = Dependencies/Horde3D
url = https://github.com/horde3d/Horde3D
[submodule "glm"]
path = glm
path = Dependencies/glm
url = https://github.com/g-truc/glm
[submodule "tinyobjloader"]
path = tinyobjloader
path = Dependencies/tinyobjloader
url = https://github.com/syoyo/tinyobjloader

+ 3
- 3
BuildDependencies.sh View File

@ -1,14 +1,14 @@
#!/bin/sh
echo Building Bullet3...
cd bullet3 && ./build_cmake_pybullet_double.sh
cd Dependencies/bullet3 && ./build_cmake_pybullet_double.sh
echo Finished building Bullet3!
echo
echo Building Base2.0...
# TODO: Fix this foolishness
cd base2.0 && jam -j4 && jam -j4 libBase20
cd Dependencies/base2.0 && jam -j4 && jam -j4 libBase20
echo Finished building Base2.0!
echo Building Horde3D...
cd ../Horde3D && mkdir build && cd build && cmake .. && make -j4
cd Dependencies/Horde3D && mkdir build && cd build && cmake .. && make -j4
echo Finished building Horde3D!

+ 1
- 1
BuildDependencies_Debug.sh View File

@ -7,7 +7,7 @@ echo
echo Building Base2.0...
# TODO: Fix this foolishness
# TODO: Add debug build
cd base2.0 && jam -j4 && jam -j4 libBase20
cd Dependencies/base2.0 && jam -j4 && jam -j4 libBase20
echo Finished building Base2.0!
echo Building Horde3D...


+ 5
- 2
CleanAll.sh View File

@ -1,4 +1,7 @@
#!/bin/sh
jam clean
cd bullet3 && rm -r build_cmake
cd ../base2.0 && jam clean
cd Dependencies/bullet3 && rm -r build_cmake
rm -r build_cmake_debug
cd ../../Dependencies/base2.0 && jam clean
rm -r ../Horde3D/build
# TODO: Add Horde clean

Horde3D → Dependencies/Horde3D View File


base2.0 → Dependencies/base2.0 View File


bullet3 → Dependencies/bullet3 View File


glm → Dependencies/glm View File


tinygltf → Dependencies/tinygltf View File


tinyobjloader → Dependencies/tinyobjloader View File


+ 21
- 13
Jamrules View File

@ -17,16 +17,23 @@ LINK = clang++ ;
C++FLAGS = -std=c++11 -Wall -Wextra -Wno-unused-parameter -DBT_USE_DOUBLE_PRECISION -g ;
HDRS = src
bullet3/src bullet3/Extras/Serialize/BulletWorldImporter
base2.0
tinygltf tinyobjloader
glm
Horde3D/Horde3D/Bindings/C++ ;
Dependencies/bullet3/src Dependencies/bullet3/Extras/Serialize/BulletWorldImporter
Dependencies/base2.0
Dependencies/tinygltf Dependencies/tinyobjloader
Dependencies/glm
Dependencies/Horde3D/Horde3D/Bindings/C++ ;
if $(DEBUG_BUILD)
{ BULLET3_BUILD_DIR = bullet3/build_cmake_debug ; }
{
BULLET3_BUILD_DIR = Dependencies/bullet3/build_cmake_debug ;
# TODO: Separate Horde debug and release build directories
HORDE3D_BUILD_DIR = Dependencies/Horde3D/build/Horde3D ;
}
else
{ BULLET3_BUILD_DIR = bullet3/build_cmake ; }
{
BULLET3_BUILD_DIR = Dependencies/bullet3/build_cmake ;
HORDE3D_BUILD_DIR = Dependencies/Horde3D/build/Horde3D ;
}
OPTIM = -O0 ;
@ -47,7 +54,7 @@ LINKLIBS =
-lGLEW
# Base
-Lbase2.0 -lBase20
-LDependencies/base2.0 -lBase20
# Bullet libraries
-L$(BULLET3_BUILD_DIR)/src/BulletDynamics
@ -70,8 +77,8 @@ LINKLIBS =
# -lBulletInverseDynamics
# -lBulletInverseDynamicsUtils
-LHorde3D/build/Horde3D/Source/Horde3DEngine
-LHorde3D/build/Horde3D/Source/Horde3DUtils
-LDependencies/Horde3D/build/Horde3D/Source/Horde3DEngine
-LDependencies/Horde3D/build/Horde3D/Source/Horde3DUtils
-lHorde3D
-lHorde3DUtils
;
@ -80,7 +87,7 @@ LINKLIBS =
# TODO: Copy libs to better directory, or static link?
LINKFLAGS = -g
-Wl,-rpath,.:$(BULLET3_BUILD_DIR)/src/BulletSoftBody:$(BULLET3_BUILD_DIR)/Extras/InverseDynamics:$(BULLET3_BUILD_DIR)/src/BulletInverseDynamics:$(BULLET3_BUILD_DIR)/examples/ThirdPartyLibs/BussIK:$(BULLET3_BUILD_DIR)/src/BulletDynamics:$(BULLET3_BUILD_DIR)/src/BulletCollision:$(BULLET3_BUILD_DIR)/src/LinearMath:$(BULLET3_BUILD_DIR)/src/Bullet3Common:$(BULLET3_BUILD_DIR)/src/Bullet3Collision:$(BULLET3_BUILD_DIR)/Extras/Serialize/BulletWorldImporter:Horde3D/build/Horde3D/Source/Horde3DEngine:Horde3D/build/Horde3D/Source/Horde3DUtils ;
-Wl,-rpath,.:$(BULLET3_BUILD_DIR)/src/BulletSoftBody:$(BULLET3_BUILD_DIR)/Extras/InverseDynamics:$(BULLET3_BUILD_DIR)/src/BulletInverseDynamics:$(BULLET3_BUILD_DIR)/examples/ThirdPartyLibs/BussIK:$(BULLET3_BUILD_DIR)/src/BulletDynamics:$(BULLET3_BUILD_DIR)/src/BulletCollision:$(BULLET3_BUILD_DIR)/src/LinearMath:$(BULLET3_BUILD_DIR)/src/Bullet3Common:$(BULLET3_BUILD_DIR)/src/Bullet3Collision:$(BULLET3_BUILD_DIR)/Extras/Serialize/BulletWorldImporter:$(HORDE3D_BUILD_DIR)/Source/Horde3DEngine:$(HORDE3D_BUILD_DIR)/Source/Horde3DUtils ;
##
## Jam stuff
@ -139,8 +146,9 @@ rule BuildAsset
# This rule ensures if the .blend is updated, the .obj and .dae are dirty (causing BuildAsset to run)
Depends $(1:S=.obj) : $(2) ;
Depends $(1:S=.dae) : $(2) ;
Clean clean : $(1:S=.obj) $(1:S=.dae) ;
# TODO: I don't normally want to reprocess assets on clean. Make a separate CleanAssets rule
# Clean clean : $(1:S=.obj) $(1:S=.dae) ;
}
actions BuildAsset


+ 1
- 1
build_cmake_pybullet_double_debug.sh View File

@ -1,5 +1,5 @@
#!/bin/sh
cd bullet3
cd Dependencies/bullet3
if [ -e CMakeCache.txt ]; then
rm CMakeCache.txt


Loading…
Cancel
Save