Merge pull request #1 from rincew1nd/Development

New release
rincew1nd · Jul 1, 2018 · 0b7dd06 · 0b7dd06
2 parents 2fb7a19 + 496f030
commit 0b7dd06
Show file tree

Hide file tree

Showing 43 changed files with 725 additions and 368 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	Minesweeper
 APP_AUTHOR	:=	Rincew1nd
-APP_VERSION	:=	1.0.3
+APP_VERSION	:=	1.1.0
 ICON		:=	icon.jpg
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
@@ -52,12 +52,12 @@ CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 -Wno-sign-compare
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-LIBS	:=	-lSDL2_image -lSDL2_mixer -lSDL2 -lnx
+LIBS	:=	-lSDL2_image -lSDL2_mixer -lSDL2_ttf -lSDL2 -lfreetype -lpng -lz -lbz2 -lnx -lm
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
@@ -77,12 +77,23 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 export TOPDIR	:=	$(CURDIR)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
-			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+					$(foreach dir,$(SOURCES)/Engine,$(CURDIR)/$(dir)) \
+					$(foreach dir,$(SOURCES)/GameObjects,$(CURDIR)/$(dir)) \
+					$(foreach dir,$(SOURCES)/Scenes,$(CURDIR)/$(dir)) \
+					$(foreach dir,$(SOURCES)/Widgets,$(CURDIR)/$(dir)) \
+					$(foreach dir,$(SOURCES),$(foreach subdir,$(SOURCES)/$(dir),$(CURDIR)/$(dir)/$(subdir))) \
+					$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+$(info VAR is $(VPATH))
 
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 
 CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) \
+				$(foreach dir,$(SOURCES)/Engine,$(notdir $(wildcard $(dir)/*.cpp))) \
+				$(foreach dir,$(SOURCES)/GameObjects,$(notdir $(wildcard $(dir)/*.cpp))) \
+				$(foreach dir,$(SOURCES)/Scenes,$(notdir $(wildcard $(dir)/*.cpp))) \
+				$(foreach dir,$(SOURCES)/Widgets,$(notdir $(wildcard $(dir)/*.cpp)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
 
@@ -194,4 +205,4 @@ $(OFILES_SRC)	: $(HFILES_BIN)
 
 #---------------------------------------------------------------------------------------
 endif
-#---------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------
diff --git a/README.md b/README.md
@@ -16,6 +16,9 @@ Feel free to report bugs and contribute!
 
 ## To-Do:
 
-* Option screen with basic parametrization
-* Touch screen gestures for zooming and moving field
+* Touchscreen gestures for zooming and moving field
 * Timer and scoreboard
+
+## Roadmap for next release:
+
+* Timer and scoreboard (000%).
diff --git a/romfs/Pixeled.ttf b/romfs/Pixeled.ttf
diff --git a/romfs/easyButton.bmp → romfs/arrowLeftButton.bmp b/romfs/easyButton.bmp → romfs/arrowLeftButton.bmp
diff --git a/romfs/hardButton.bmp → romfs/arrowRightButton.bmp b/romfs/hardButton.bmp → romfs/arrowRightButton.bmp
diff --git a/romfs/escButton.bmp b/romfs/escButton.bmp
diff --git a/romfs/mediumButton.bmp b/romfs/mediumButton.bmp
diff --git a/romfs/minusButton.bmp b/romfs/minusButton.bmp
diff --git a/romfs/plusButton.bmp b/romfs/plusButton.bmp
diff --git a/romfs/settingsButton.bmp b/romfs/settingsButton.bmp
diff --git a/source/Board.cpp b/source/Board.cpp
diff --git a/source/Button.cpp b/source/Button.cpp
diff --git a/source/Button.hpp b/source/Button.hpp
diff --git a/source/Cell.hpp b/source/Cell.hpp
diff --git a/source/DrawableObject.cpp b/source/DrawableObject.cpp
diff --git a/source/Engine/Button.cpp b/source/Engine/Button.cpp
@@ -0,0 +1,12 @@
+#include "Button.hpp"
+
+Button::Button(int x, int y, int w, int h, std::string name, std::function<void()> func) : SpriteObject(x, y, w, h)
+{
+    _name = name;
+    SetAction(func);
+}
+
+Button::Button(int x, int y, int w, int h, std::string name) : SpriteObject(x, y, w, h)
+{
+    _name = name;
+}