Merge branch 'master' of ssh://git.chaotikum.org:617/ReadMailReallyFast/code

[AUTOMERGE]

Makefile

@@ -41,15 +41,16 @@ MAKEFLAGS += --no-builtin-rules
 .PHONY: all clean
 all: ${TARGETS}
 
-${BINDIR}/%: $(patsubst ${SRCDIR}/%,${OBJDIR}/%,${APPDIR})/%.o ${OBJECTS}
+${BINDIR}/%: $(patsubst ${SRCDIR}/%,${OBJDIR}/%,${APPDIR})/%.o ${OBJECTS} Makefile ${APPDIR}/%.ldflags
 	${MKDIR} ${@D} && ${CXX} ${CXXFLAGS} ${LFLAGS} -o $@ $< ${OBJECTS} $(shell [ -r $(patsubst ${OBJDIR}/%.o,${SRCDIR}/%.ldflags,$<) ] && cat $(patsubst ${OBJDIR}/%.o,${SRCDIR}/%.ldflags,$<) ) && touch $@
 
-${OBJDIR}/%.o: ${SRCDIR}/%.cpp ${DEPDIR}/%.d
+${OBJDIR}/%.o: ${SRCDIR}/%.cpp ${DEPDIR}/%.d Makefile
 	${MKDIR} ${@D} && ${MKDIR} $(patsubst ${OBJDIR}/%,${DEPDIR}/%,${@D}) && ${CXX} ${CXXFLAGS} ${DEPFLAGS} ${LFLAGS} -o $@ -c $< && touch $@
 
-${OBJDIR}/%.o: ${SRCDIR}/%.c ${DEPDIR}/%.d
+${OBJDIR}/%.o: ${SRCDIR}/%.c ${DEPDIR}/%.d Makefile
 	${MKDIR} ${@D} && ${MKDIR} $(patsubst ${OBJDIR}/%,${DEPDIR}/%,${@D}) && ${CC} ${CFLAGS} ${DEPFLAGS} ${LFLAGS} -o $@ -c $< && touch $@
 
+${APPDIR}/%.ldflags: ;
 
 ${DEPDIR}/%.d: ;
 .PRECIOUS: ${DEPDIR}/%.d ${OBJDIR}/%.o

src/app/rmrf.cpp

-#include "../ui/View.h"
-
-namespace rmrf {
+#include "ui/View.h"
 
 int main() {
-	ui::init_ui();
-	ui::destroy_ui();
-    return 0;
-}
+    auto ui_handle = std::make_shared<rmrf::ui::display>();
 
+    return 0;
 }

src/ui/View.cpp

-#include <ncurses/cursesw.h>
+#ifdef __UNIX__
+	#include <ncurses/cursesw.h>
+#else
+	#include <ncursesw/ncurses.h>
+#endif
 
-#include "View.h"
+#include "ui/View.h"
 
-namespace rmrf {
-	namespace ui {
+namespace rmrf::ui {
 
-		void init_ui() {
-			initscr();
-		}
+display::display() {
+    initscr();
+}
 
-		void destroy_ui() {
-			endwin();
-		}
+display::~display() {
+    endwin();
+}
 
-	}
 }

src/ui/View.h

-#ifndef VIEW_H
-#define VIEW_H
+#pragma once
 
-namespace rmrf {
-namespace ui {
+#include <memory>
 
-void init_ui( void );
-void destroy_ui( void );
+namespace rmrf::ui {
+
+struct display : std::enable_shared_from_this<display> {
+    display();
+    ~display();
+};
 
 }
-}
-#endif