cinnaboot
/
orbital_shipping
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update Makefile README and libTangerine ref

main
cinnaboot 5 years ago
parent
b8d667a94d
commit
752fbee43f
3 changed files with 7 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Makefile
  2. 18
      README
  3. 2
      ext/tangerine

8
Makefile
Unescape View File

@ -30,7 +30,8 @@ ifeq ($(USE_INTERNAL_ASSIMP), y)
$(warning using internal assimp) $(warning using internal assimp)
ASSIMP_DIR := $(LIBDIR)/ext/assimp ASSIMP_DIR := $(LIBDIR)/ext/assimp
CXXFLAGS += -I$(ASSIMP_DIR)/include CXXFLAGS += -I$(ASSIMP_DIR)/include
LDFLAGS := -lSDL2 -lGLEW -lGL -L$(ASSIMP_DIR)/lib -lassimp ASSIMP_LIB := $(ASSIMP_DIR)/build/code/libassimp.a
LDFLAGS := -lSDL2 -lGLEW -lGL
endif endif
@ -44,7 +45,7 @@ mkdirs:
.PHONY: mkdirs .PHONY: mkdirs
$(BIN): $(COMMON_OBJECTS) $(OBJECTS) $(LIB) $(BIN): $(COMMON_OBJECTS) $(OBJECTS) $(LIB)
$(CXX) -o $(BIN) $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB) $(CXX) -o $(BIN) $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB) $(ASSIMP_LIB)
$(TEST_BIN): $(TEST_OBJECTS) $(TEST_MAIN_OBJ) $(TEST_BIN): $(TEST_OBJECTS) $(TEST_MAIN_OBJ)
$(CXX) -o $(TEST_BIN) $(LDFLAGS) $(TEST_OBJECTS) $(TEST_MAIN_OBJ) $(LIB) $(CXX) -o $(TEST_BIN) $(LDFLAGS) $(TEST_OBJECTS) $(TEST_MAIN_OBJ) $(LIB)
@ -62,8 +63,7 @@ $(TEST_MAIN_OBJ): $(TEST_MAIN_SOURCE)
$(CXX) $(CXXFLAGS) -c -MMD $(TESTDIR)/tests_main.cpp -o $(OBJDIR)/tests_main.o $(CXX) $(CXXFLAGS) -c -MMD $(TESTDIR)/tests_main.cpp -o $(OBJDIR)/tests_main.o
$(LIB): $(LIB):
USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR) build_assimp USE_INTERNAL_ASSIMP=$(USE_INTERNAL_ASSIMP) $(MAKE) -C $(LIBDIR)
$(MAKE) -C $(LIBDIR)
clean: clean:
rm -rf $(OBJDIR)/* $(BIN) bin/test_orbit rm -rf $(OBJDIR)/* $(BIN) bin/test_orbit

18
README
Unescape View File

@ -16,7 +16,8 @@ Building:
install dependencies for your environment: install dependencies for your environment:
Arch) $ sudo pacman -S assimp glew glm sdl2 catch2 gcc make Arch) $ sudo pacman -S assimp glew glm sdl2 catch2 gcc make
Fedora) $ sudo dnf install assimp-devel glew-devel glm-devel \ Fedora) $ sudo dnf install assimp-devel glew-devel glm-devel \
SDL2-devel catch-devel gcc-c++ make SDL2-devel catch-devel gcc-c++ make cmake
NOTE: fedora (33) see note below about assimp
checkout, and initialise submodule dependencies: checkout, and initialise submodule dependencies:
$ git submodule update --init --recursive $ git submodule update --init --recursive
build: build:
@ -29,18 +30,3 @@ Building:
$ USE_INTERNAL_ASSIMP=y make $ USE_INTERNAL_ASSIMP=y make
then, to run the demo,
$ cd bin
$ LD_LIBRARY_PATH=../ext/tangerine/ext/assimp/lib ./orbital_shipping
# TODO:
# (libTangerine) fold in build_assimp to make dependency
# turn off unused default features of internal assimp
# compile assimp as static lib into libTangerine if built internal
# (can remove LD_LIBRARY_PATH requirement)
# (orbital_shipping) update makefile $(LIB) target
# make sure git submodule hashes are updated
#

2
ext/tangerine

@ -1 +1 @@
Subproject commit 7676be82d4ea31e94dee2b105a9fa37518dc53cd Subproject commit ee7efd060ea8f391857cd3254c18663423e4abf2
Write Preview
Loading…
Cancel
Save