Browse Source

add build instructions, and update Makefile

main
cinnaboot 5 years ago
parent
commit
866feb3ee8
  1. 1
      .gitignore
  2. 6
      .gitmodules
  3. 8
      Makefile
  4. 10
      README
  5. 1
      ext/imgui
  6. 1
      ext/tangerine

1
.gitignore vendored

@ -1,4 +1,3 @@
build/*
ext/*
bin/*
tags

6
.gitmodules vendored

@ -0,0 +1,6 @@
[submodule "ext/imgui"]
path = ext/imgui
url = https://github.com/ocornut/imgui
[submodule "ext/tangerine"]
path = ext/tangerine
url = https://gitlab.com/cinnaboot/tangerine

8
Makefile

@ -1,9 +1,9 @@
OBJDIR := build
SRCDIR := src
LIBDIR := ext/tangerine
TESTDIR := tests
BINDIR := bin
LIBDIR := ext/tangerine
LIB := $(LIBDIR)/build/libTangerine.a
CXX := g++
@ -29,7 +29,7 @@ all: $(BIN) $(TEST_BIN)
-include $(OBJDIR)/*.d
$(BIN): $(COMMON_OBJECTS) $(OBJECTS)
$(BIN): $(COMMON_OBJECTS) $(OBJECTS) $(LIB)
$(CXX) -o $(BIN) $(LDFLAGS) $(COMMON_OBJECTS) $(OBJECTS) $(LIB)
$(TEST_BIN): $(TEST_OBJECTS) $(TEST_MAIN_OBJ)
@ -47,6 +47,10 @@ $(TEST_OBJECTS): $(TEST_SOURCES)
$(TEST_MAIN_OBJ): $(TEST_MAIN_SOURCE)
$(CXX) $(CXXFLAGS) -c -MMD $(TESTDIR)/tests_main.cpp -o $(OBJDIR)/tests_main.o
$(LIB):
$(MAKE) -C $(LIBDIR)
clean:
rm -rf $(OBJDIR)/* $(BIN) bin/test_orbit
$(MAKE) -C $(LIBDIR) clean
.PHONY: clean

10
README

@ -11,3 +11,13 @@ TODO:
try out Catch2 for testing: https://github.com/catchorg/Catch2
you know, make the actual game
Building:
install dependencies for your environment:
eg) $ sudo pacman -S assimp glew glm sdl2 catch2
checkout, and initialise submodule dependencies:
$ git submodule init
$ git submodule update --recursive
build:
$ make
binaries will be in ./bin

1
ext/imgui

@ -0,0 +1 @@
Subproject commit ee643b2ad919f9e85b973f3915d13a4fc0612a5a

1
ext/tangerine

@ -0,0 +1 @@
Subproject commit 3d947b1193653c0af4e600221cb9aa5bbccf8bc3
Loading…
Cancel
Save