From 7154cd81c709ecb21988878f8f4ec460f4094d6e Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 22 Sep 2009 14:27:56 +0000 Subject: [PATCH] modifications to build in MSYS git-svn-id: svn://anubis/anaglym/trunk@25 99a6e188-d820-4881-8870-2d33a10e2619 --- Makefile | 7 ++----- Video.cc | 2 +- Video.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 008dbba..9e1c0aa 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -# fix broken ubuntu -SHELL := bash - TARGET := anaglym COBJS := $(patsubst %.c,%.o,$(wildcard *.c)) CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc)) @@ -10,11 +7,11 @@ CDEPS := $(COBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep) DEPS := $(CDEPS) $(CXXDEPS) -LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --include; fi) +LUAINCLUDE := $(shell which lua-config >/dev/null 2>&1; if [ $$? == 0 ]; then lua-config --include; fi) ifeq ($(strip $(LUA_INCLUDE)),) LUAINCLUDE := -I/usr/include/lua5.1 endif -LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [[ $$? == 0 ]]; then lua-config --libs; fi) +LUALIBS := $(shell which lua-config >/dev/null 2>&1; if [ $$? == 0 ]; then lua-config --libs; fi) ifeq ($(strip $(LUALIBS)),) LUALIBS := -llua5.1 endif diff --git a/Video.cc b/Video.cc index 133c421..c9606c6 100644 --- a/Video.cc +++ b/Video.cc @@ -1,6 +1,6 @@ #include "Video.h" -#include +#include #include using namespace std; diff --git a/Video.h b/Video.h index c24da14..d196de3 100644 --- a/Video.h +++ b/Video.h @@ -2,7 +2,7 @@ #ifndef VIDEO_H #define VIDEO_H -#include +#include class Video {