From 8b1a9aee91126e7765d7bbea664a960965de5c47 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 8 Jul 2015 02:54:54 +1000 Subject: [PATCH] Moved source files to src/ --- makefile | 55 ++--------------- application.cpp => src/application.cpp | 0 application.hpp => src/application.hpp | 0 base_scene.cpp => src/base_scene.cpp | 0 base_scene.hpp => src/base_scene.hpp | 0 {common => src/common}/image.cpp | 0 {common => src/common}/image.hpp | 0 {common => src/common}/makefile | 0 example_scene.cpp => src/example_scene.cpp | 0 example_scene.hpp => src/example_scene.hpp | 0 {libmap => src/libmap}/makefile | 0 {libmap => src/libmap}/region.cpp | 0 {libmap => src/libmap}/region.hpp | 0 {libmap => src/libmap}/region_api.cpp | 0 {libmap => src/libmap}/region_api.hpp | 0 {libmap => src/libmap}/region_pager_api.cpp | 2 +- {libmap => src/libmap}/region_pager_api.hpp | 0 {libmap => src/libmap}/region_pager_base.cpp | 2 +- {libmap => src/libmap}/region_pager_base.hpp | 0 {libmap => src/libmap}/region_pager_lua.cpp | 0 {libmap => src/libmap}/region_pager_lua.hpp | 0 {libmap => src/libmap}/tile_sheet.cpp | 0 {libmap => src/libmap}/tile_sheet.hpp | 2 +- linit.cpp => src/linit.cpp | 0 main.cpp => src/main.cpp | 0 src/makefile | 62 ++++++++++++++++++++ scene_signal.hpp => src/scene_signal.hpp | 0 27 files changed, 70 insertions(+), 53 deletions(-) rename application.cpp => src/application.cpp (100%) rename application.hpp => src/application.hpp (100%) rename base_scene.cpp => src/base_scene.cpp (100%) rename base_scene.hpp => src/base_scene.hpp (100%) rename {common => src/common}/image.cpp (100%) rename {common => src/common}/image.hpp (100%) rename {common => src/common}/makefile (100%) rename example_scene.cpp => src/example_scene.cpp (100%) rename example_scene.hpp => src/example_scene.hpp (100%) rename {libmap => src/libmap}/makefile (100%) rename {libmap => src/libmap}/region.cpp (100%) rename {libmap => src/libmap}/region.hpp (100%) rename {libmap => src/libmap}/region_api.cpp (100%) rename {libmap => src/libmap}/region_api.hpp (100%) rename {libmap => src/libmap}/region_pager_api.cpp (99%) rename {libmap => src/libmap}/region_pager_api.hpp (100%) rename {libmap => src/libmap}/region_pager_base.cpp (98%) rename {libmap => src/libmap}/region_pager_base.hpp (100%) rename {libmap => src/libmap}/region_pager_lua.cpp (100%) rename {libmap => src/libmap}/region_pager_lua.hpp (100%) rename {libmap => src/libmap}/tile_sheet.cpp (100%) rename {libmap => src/libmap}/tile_sheet.hpp (98%) rename linit.cpp => src/linit.cpp (100%) rename main.cpp => src/main.cpp (100%) create mode 100644 src/makefile rename scene_signal.hpp => src/scene_signal.hpp (100%) diff --git a/makefile b/makefile index 11ac490..eee2133 100644 --- a/makefile +++ b/makefile @@ -1,59 +1,14 @@ -#NOTE: I know it's a wonky spot, sue me +OUTDIR=out + +all: $(OUTDIR) + $(MAKE) -C src + debug: export CXXFLAGS+=-g debug: clean all -#include directories -INCLUDES+=. common libmap - -#libraries -#the order of the $(LIBS) is important, at least for MinGW -LIBS+=libcommon.a libmap.a -ifeq ($(OS),Windows_NT) - LIBS+=-lmingw32 -endif -LIBS+=-lSDL2main -lSDL2 -lSDL2_image -llua -ifeq ($(shell uname), Linux) - #I don't know what this does, but Ubuntu needs it (dynamic linking for lua) - LIBS+=-ldl -endif - -#flags -CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) -ifeq ($(shell uname), Linux) - #read data about the current install - CXXFLAGS+=$(shell sdl-config --cflags --static-libs) -endif - -#source -CXXSRC=$(wildcard *.cpp) - -#objects -OBJDIR=obj -OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) - -#output -OUTDIR=out -OUT=$(addprefix $(OUTDIR)/,map) - -#targets -all: $(OBJ) $(OUT) - $(MAKE) -C common - $(MAKE) -C libmap - $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) - -$(OBJ): | $(OBJDIR) - -$(OUT): | $(OUTDIR) - -$(OBJDIR): - mkdir $(OBJDIR) - $(OUTDIR): mkdir $(OUTDIR) -$(OBJDIR)/%.o: %.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< - clean: ifeq ($(OS),Windows_NT) $(RM) *.o *.a *.exe diff --git a/application.cpp b/src/application.cpp similarity index 100% rename from application.cpp rename to src/application.cpp diff --git a/application.hpp b/src/application.hpp similarity index 100% rename from application.hpp rename to src/application.hpp diff --git a/base_scene.cpp b/src/base_scene.cpp similarity index 100% rename from base_scene.cpp rename to src/base_scene.cpp diff --git a/base_scene.hpp b/src/base_scene.hpp similarity index 100% rename from base_scene.hpp rename to src/base_scene.hpp diff --git a/common/image.cpp b/src/common/image.cpp similarity index 100% rename from common/image.cpp rename to src/common/image.cpp diff --git a/common/image.hpp b/src/common/image.hpp similarity index 100% rename from common/image.hpp rename to src/common/image.hpp diff --git a/common/makefile b/src/common/makefile similarity index 100% rename from common/makefile rename to src/common/makefile diff --git a/example_scene.cpp b/src/example_scene.cpp similarity index 100% rename from example_scene.cpp rename to src/example_scene.cpp diff --git a/example_scene.hpp b/src/example_scene.hpp similarity index 100% rename from example_scene.hpp rename to src/example_scene.hpp diff --git a/libmap/makefile b/src/libmap/makefile similarity index 100% rename from libmap/makefile rename to src/libmap/makefile diff --git a/libmap/region.cpp b/src/libmap/region.cpp similarity index 100% rename from libmap/region.cpp rename to src/libmap/region.cpp diff --git a/libmap/region.hpp b/src/libmap/region.hpp similarity index 100% rename from libmap/region.hpp rename to src/libmap/region.hpp diff --git a/libmap/region_api.cpp b/src/libmap/region_api.cpp similarity index 100% rename from libmap/region_api.cpp rename to src/libmap/region_api.cpp diff --git a/libmap/region_api.hpp b/src/libmap/region_api.hpp similarity index 100% rename from libmap/region_api.hpp rename to src/libmap/region_api.hpp diff --git a/libmap/region_pager_api.cpp b/src/libmap/region_pager_api.cpp similarity index 99% rename from libmap/region_pager_api.cpp rename to src/libmap/region_pager_api.cpp index 10eaf95..6a14b54 100644 --- a/libmap/region_pager_api.cpp +++ b/src/libmap/region_pager_api.cpp @@ -104,7 +104,7 @@ static int unloadRegion(lua_State* L) { return 0; } -//TODO: check that parameters are not null +//TODO: (1) check that parameters are not null static int setOnLoad(lua_State* L) { RegionPagerLua* pager = reinterpret_cast(lua_touserdata(L, 1)); diff --git a/libmap/region_pager_api.hpp b/src/libmap/region_pager_api.hpp similarity index 100% rename from libmap/region_pager_api.hpp rename to src/libmap/region_pager_api.hpp diff --git a/libmap/region_pager_base.cpp b/src/libmap/region_pager_base.cpp similarity index 98% rename from libmap/region_pager_base.cpp rename to src/libmap/region_pager_base.cpp index 24b2858..79017da 100644 --- a/libmap/region_pager_base.cpp +++ b/src/libmap/region_pager_base.cpp @@ -28,7 +28,7 @@ RegionPagerBase::~RegionPagerBase() { UnloadAll(); }; -//TODO: add nullptr checks to the calls to GetRegion() +//TODO: (1) add nullptr checks to the calls to GetRegion() Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) { Region* ptr = GetRegion(x, y); diff --git a/libmap/region_pager_base.hpp b/src/libmap/region_pager_base.hpp similarity index 100% rename from libmap/region_pager_base.hpp rename to src/libmap/region_pager_base.hpp diff --git a/libmap/region_pager_lua.cpp b/src/libmap/region_pager_lua.cpp similarity index 100% rename from libmap/region_pager_lua.cpp rename to src/libmap/region_pager_lua.cpp diff --git a/libmap/region_pager_lua.hpp b/src/libmap/region_pager_lua.hpp similarity index 100% rename from libmap/region_pager_lua.hpp rename to src/libmap/region_pager_lua.hpp diff --git a/libmap/tile_sheet.cpp b/src/libmap/tile_sheet.cpp similarity index 100% rename from libmap/tile_sheet.cpp rename to src/libmap/tile_sheet.cpp diff --git a/libmap/tile_sheet.hpp b/src/libmap/tile_sheet.hpp similarity index 98% rename from libmap/tile_sheet.hpp rename to src/libmap/tile_sheet.hpp index f327151..74affdf 100644 --- a/libmap/tile_sheet.hpp +++ b/src/libmap/tile_sheet.hpp @@ -47,7 +47,7 @@ public: void DrawRegionTo(SDL_Renderer* const renderer, Region* const region, int camX, int camY, double scaleX = 1.0, double scaleY = 1.0); //accessors - //DOCS: reuse Image::clip for tile sizes + //DOCS: Reuse Image::clip for tile sizes int GetCountX() { return countX; } int GetCountY() { return countY; } int GetTileW() { return clip.w; } diff --git a/linit.cpp b/src/linit.cpp similarity index 100% rename from linit.cpp rename to src/linit.cpp diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/src/makefile b/src/makefile new file mode 100644 index 0000000..102623a --- /dev/null +++ b/src/makefile @@ -0,0 +1,62 @@ +#include directories +INCLUDES+=. common libmap + +#libraries +#the order of the $(LIBS) is important, at least for MinGW +LIBS+=libcommon.a libmap.a +ifeq ($(OS),Windows_NT) + LIBS+=-lmingw32 +endif +LIBS+=-lSDL2main -lSDL2 -lSDL2_image -llua +ifeq ($(shell uname), Linux) + #I don't know what this does, but Ubuntu needs it (dynamic linking for lua) + LIBS+=-ldl +endif + +#flags +CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) +ifeq ($(shell uname), Linux) + #read data about the current install + CXXFLAGS+=$(shell sdl-config --cflags --static-libs) +endif + +#source +CXXSRC=$(wildcard *.cpp) + +#objects +OBJDIR=obj +OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) + +#output +OUTDIR=../out +OUT=$(addprefix $(OUTDIR)/,map) + +#targets +all: $(OBJ) $(OUT) + $(MAKE) -C common + $(MAKE) -C libmap + $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) + +$(OBJ): | $(OBJDIR) + +$(OUT): | $(OUTDIR) + +$(OBJDIR): + mkdir $(OBJDIR) + +$(OUTDIR): + mkdir $(OUTDIR) + +$(OBJDIR)/%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< + +clean: +ifeq ($(OS),Windows_NT) + $(RM) *.o *.a *.exe +else ifeq ($(shell uname), Linux) + find . -type f -name '*.o' -exec rm -f -r -v {} \; + find . -type f -name '*.a' -exec rm -f -r -v {} \; + rm -f -v $(OUT) +endif + +rebuild: clean all diff --git a/scene_signal.hpp b/src/scene_signal.hpp similarity index 100% rename from scene_signal.hpp rename to src/scene_signal.hpp