From c0ace6fed621c31f6c72de5ee082391648536e21 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sun, 14 Aug 2011 11:35:37 -0400 Subject: [PATCH] Basic initializiation code I print some messages to the screen and I have a makefile to compile libsaria and gui code. --- .gitignore | 4 ++-- Makefile | 24 ++++++++++++++++++++++++ gui/ocarina.cpp | 12 ++++++++++++ include/libsaria/libsaria.h | 8 ++++++++ include/libsaria/print.h | 6 ++++++ libsaria/init.cpp | 10 ++++++++++ libsaria/print.cpp | 10 ++++++++++ scripts/Makefile | 22 ++++++++++++++++++++++ 8 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 Makefile create mode 100644 gui/ocarina.cpp create mode 100644 include/libsaria/libsaria.h create mode 100644 include/libsaria/print.h create mode 100644 libsaria/init.cpp create mode 100644 libsaria/print.cpp create mode 100644 scripts/Makefile diff --git a/.gitignore b/.gitignore index 37eed9c0..a80f905c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -*.pyc +*.o *.swp -ocarina.py +ocarina diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..ec6ad364 --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ + +export CC = g++ +export CFLAGS = -Wall -Werror -g -O2 +export INCLUDE = -I$(CURDIR)/include +#export LINK = `sdl-config --cflags --libs` -lSDL_image -lSDL_mixer `pkg-config --cflags --libs lua` -ldl +export BUILD = $(CC) $(CFLAGS) $(INCLUDE) +export SRCDIR = $(CURDIR) + +DIRS = libsaria gui +CLEANDIRS = $(DIRS:%=clean-%) + +.PHONY: all $(DIRS) clean $(CLEANDIRS) + +all: $(DIRS) + $(BUILD) $(shell find . | grep "\.o$$") -o ocarina $(LINK) + +$(DIRS): + $(MAKE) -f $(SRCDIR)/scripts/Makefile -C $@ + +clean: $(CLEANDIRS) + rm -f *.o a.out + +$(CLEANDIRS): + $(MAKE) -f $(SRCDIR)/scripts/Makefile -C $(@:clean-%=%) clean diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp new file mode 100644 index 00000000..d53418a9 --- /dev/null +++ b/gui/ocarina.cpp @@ -0,0 +1,12 @@ + +#include +using namespace std; + +#include + +int main() +{ + print("Ocarina 5.0"); + libsaria_init(); + return 0; +} diff --git a/include/libsaria/libsaria.h b/include/libsaria/libsaria.h new file mode 100644 index 00000000..c5dac450 --- /dev/null +++ b/include/libsaria/libsaria.h @@ -0,0 +1,8 @@ +#ifndef LIBSARIA_H +#define LIBSARIA_H + +#include + +void libsaria_init(); + +#endif /* LIBSARIA_H */ diff --git a/include/libsaria/print.h b/include/libsaria/print.h new file mode 100644 index 00000000..beb2b6f7 --- /dev/null +++ b/include/libsaria/print.h @@ -0,0 +1,6 @@ +#ifndef LIBSARIA_PRINT +#define LIBSARIA_PRINT + +void print(string item); + +#endif /* LIBSARIA_PRINT */ diff --git a/libsaria/init.cpp b/libsaria/init.cpp new file mode 100644 index 00000000..bb4f73dd --- /dev/null +++ b/libsaria/init.cpp @@ -0,0 +1,10 @@ + +#include +using namespace std; + +#include + +void libsaria_init() +{ + print("Initializing libsaria"); +} diff --git a/libsaria/print.cpp b/libsaria/print.cpp new file mode 100644 index 00000000..5204196a --- /dev/null +++ b/libsaria/print.cpp @@ -0,0 +1,10 @@ + +#include +using namespace std; + +#include + +void print(string item) +{ + cout << item << endl; +} diff --git a/scripts/Makefile b/scripts/Makefile new file mode 100644 index 00000000..f9fdb3aa --- /dev/null +++ b/scripts/Makefile @@ -0,0 +1,22 @@ +# Bryan Schumaker (4 / 1 / 2011) + +DIRS = $(shell ls -l | grep '^d' | awk '{print $$9}') +FILES = $(shell ls *.cpp) +OBJS = $(FILES:%.cpp=%.o) +CLEANDIRS = $(DIRS:%=clean-%) + +.PHONY: all $(DIRS) clean $(CLEANDIRS) + +all:$(OBJS) $(DIRS) + +%.o: %.cpp + $(BUILD) -c $*.cpp $(LINK) + +$(DIRS): + $(MAKE) -f $(SRCDIR)/scripts/Makefile -C $@ + +clean: $(CLEANDIRS) + rm -f *.o + +$(CLEANDIRS): + $(MAKE) -f $(SRCDIR)/scripts/Makefile -C $(@:clean-%=%) clean