From 2640ea3de84cc9bdb940ad1e56bbcb681eb4132f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 23 Oct 2014 17:24:56 +0900
Subject: [PATCH] Fixing build

---
 Makefile     | 103 ---------------------------------------------------
 Moonfall.cbp |   2 +
 2 files changed, 2 insertions(+), 103 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index dff412c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-TARGET = Moonfall
-
-OBJDIRBASE = obj
-DEPDIRBASE = dep
-TARGETDIRBASE = bin
-
-CPP = g++
-ECHO = echo
-RM = rm
-MKDIR = mkdir
-MAKE = make
-EXIT = exit
-LS = ls
-
-CPPFILES = $(shell $(LS) -t *.cpp)
-
-CPPFLAGS = -fno-strict-aliasing -Wno-multichar -Wall `wx-config --cflags` `sdl-config --cflags`
-LFLAGS = `wx-config --libs` `sdl-config --libs` -llua -lSDL_image -lSDL_ttf
-
-DBGCPPFLAGS = -g -pg -DDEBUG
-RELCPPFLAGS =
-DEVCPPFLAGS = -DDEVELOPER
-
-DBGLFLAGS = -pg
-RELLFLAGS =
-DEVLFLAGS =
-
-ifeq ($(CFG), LINUX_DBG_DEV)
-CPPFLAGS += $(DBGCPPFLAGS)
-CPPFLAGS += $(DEVCPPFLAGS)
-LFLAGS += $(DBGLFLAGS)
-LFLAGS += $(DEVLFLAGS)
-CFGSUBDIR = LinuxDbgDev
-endif
-ifeq ($(CFG), LINUX_REL_DEV)
-CPPFLAGS += $(RELCPPFLAGS)
-CPPFLAGS += $(DEVCPPFLAGS)
-LFLAGS += $(RELLFLAGS)
-LFLAGS += $(DEVLFLAGS)
-CFGSUBDIR = LinuxRelDev
-endif
-ifeq ($(CFG), LINUX_DBG)
-CPPFLAGS += $(DBGCPPFLAGS)
-LFLAGS += $(DBGLFLAGS)
-CFGSUBDIR = LinuxDbg
-endif
-ifeq ($(CFG), LINUX_REL)
-CPPFLAGS += $(RELCPPFLAGS)
-LFLAGS += $(RELLFLAGS)
-CFGSUBDIR = LinuxRel
-endif
-
-OBJDIR = $(OBJDIRBASE)/$(CFGSUBDIR)
-DEPDIR = $(DEPDIRBASE)/$(CFGSUBDIR)
-TARGETDIR = $(TARGETDIRBASE)/$(CFGSUBDIR)
-
-TARGETFILE = $(TARGETDIR)/$(TARGET)
-OBJFILES = $(CPPFILES:%.cpp=$(OBJDIR)/%.o)
-DEPFILES = $(CPPFILES:%.cpp=$(DEPDIR)/%.d)
-
-all: cfgcheck $(TARGETFILE)
-
-$(TARGETFILE): dirs $(OBJFILES)
-	@$(ECHO) "Linking" $(TARGETFILE)...
-	$(CPP) $(LFLAGS) $(OBJFILES) -o $(TARGETFILE)
-
-$(OBJDIR)/%.o: %.cpp
-	@$(MKDIR) -p $(OBJDIR) $(DEPDIR)
-	@$(ECHO) "Compiling" $*.cpp...
-	@$(CPP) $(CPPFLAGS) -c $*.cpp -o $(OBJDIR)/$*.o
-	@$(CPP) $(CPPFLAGS) -MM $*.cpp >> $(DEPDIR)/$*.d
-	@$(ECHO) -n $(OBJDIR)"/" > $(DEPDIR)/$*.d ; $(CPP) $(CPPFLAGS) -MM $*.cpp >> $(DEPDIR)/$*.d
-
-cfgcheck:
-ifeq ($(CFGSUBDIR),)
-	@$(ECHO) "Invalid build configuration (CFG); valid options are:"
-	@$(ECHO) "	* LINUX_DBG_DEV"
-	@$(ECHO) "	* LINUX_REL_DEV"
-	@$(ECHO) "	* LINUX_DBG"
-	@$(ECHO) "	* LINUX_REL"
-	@$(EXIT) 1
-endif
-
-dirs:
-	@$(MKDIR) -p $(OBJDIR) $(DEPDIR) $(TARGETDIR)
-
-distclean: cleanall
-
-clean: cfgcheck
-	@$(ECHO) "Cleaning:" $(TARGET)...
-	@$(RM) -f -r $(OBJDIR) $(DEPDIR) $(TARGETDIR)
-
-cleanall:
-	@$(ECHO) "Cleaning all..."
-	@$(RM) -f -r $(OBJDIRBASE) $(DEPDIRBASE) $(TARGETDIRBASE)
-
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
-ifeq (,$(findstring cleanall,$(MAKECMDGOALS)))
-ifeq (,$(findstring distclean,$(MAKECMDGOALS)))
--include $(DEPFILES)
-endif
-endif
-endif
diff --git a/Moonfall.cbp b/Moonfall.cbp
index b245731..13dc104 100644
--- a/Moonfall.cbp
+++ b/Moonfall.cbp
@@ -66,7 +66,9 @@
 		<Linker>
 			<Add option="`wx-config --libs`" />
 			<Add option="`sdl-config --libs`" />
+			<Add option="-lz" />
 			<Add option="-llua5.1" />
+			<Add option="-lSDL_ttf" />
 			<Add option="-lSDL_image" />
 		</Linker>
 		<Unit filename="Actor.cpp">