Browse Source

use make auto dependencies

master
cinnaboot 8 years ago
parent
commit
137f7e15f0
  1. 7
      Makefile
  2. 1
      src/hexgame.cpp

7
Makefile

@ -40,12 +40,14 @@ SOURCES = $(wildcard $(SRC_DIR)/*.cpp)
OBJECTS = $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SOURCES)) OBJECTS = $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SOURCES))
all: $(IMGUI_OBJECTS) $(OBJ_DIR)/gl3w.o $(OBJECTS) all: $(IMGUI_OBJECTS) $(OBJ_DIR)/gl3w.o $(OBJECTS)
$(CXX) -o $(OBJ_DIR)/hexgame $(LDFLAGS) $(GL3W_LDFLAGS) $(OBJ_DIR)/* $(CXX) -o $(OBJ_DIR)/hexgame $(LDFLAGS) $(GL3W_LDFLAGS) $(OBJ_DIR)/*.o
mkdir -p bin mkdir -p bin
mv $(OBJ_DIR)/hexgame bin mv $(OBJ_DIR)/hexgame bin
-include $(OBJ_DIR)/*.d
$(OBJECTS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp $(OBJECTS): $(OBJ_DIR)/%.o : $(SRC_DIR)/%.cpp
$(CXX) -c $(CXXFLAGS) $< -o $@ $(CXX) $(CXXFLAGS) -c -MMD $< -o $@
info: info:
@echo "SOURCES:" @echo "SOURCES:"
@ -72,3 +74,4 @@ $(OBJ_DIR)/gl3w.o:
.PHONY: clean .PHONY: clean
clean: clean:
rm -f bin/hexgame $(OBJ_DIR)/* rm -f bin/hexgame $(OBJ_DIR)/*

1
src/hexgame.cpp

@ -41,7 +41,6 @@
using std::vector; using std::vector;
game_state* g_game_state; game_state* g_game_state;
render_state* g_render_state; render_state* g_render_state;
vector<Point> g_polygon_select_vertices = {Point(), Point(), Point(), Point()}; vector<Point> g_polygon_select_vertices = {Point(), Point(), Point(), Point()};

Loading…
Cancel
Save