josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modifications to build in MSYS

Browse Source 
git-svn-id: svn://anubis/anaglym/trunk@25 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
Josh Holtrop 2009-09-22 14:27:56 +00:00
parent ccf24d1777
commit 7154cd81c7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,7 +1,4 @@
# fix broken ubuntu
SHELL := bash
TARGET := anaglym TARGET := anaglym
COBJS := $(patsubst %.c,%.o,$(wildcard *.c)) COBJS := $(patsubst %.c,%.o,$(wildcard *.c))
CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc)) CXXOBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
@ -10,11 +7,11 @@ CDEPS := $(COBJS:.o=.dep)
CXXDEPS := $(CXXOBJS:.o=.dep) CXXDEPS := $(CXXOBJS:.o=.dep)
DEPS := $(CDEPS) $(CXXDEPS) 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)),) ifeq ($(strip $(LUA_INCLUDE)),)
LUAINCLUDE := -I/usr/include/lua5.1 LUAINCLUDE := -I/usr/include/lua5.1
endif 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)),) ifeq ($(strip $(LUALIBS)),)
LUALIBS := -llua5.1 LUALIBS := -llua5.1
endif endif

2
Video.cc
View File

@ -1,6 +1,6 @@
#include "Video.h" #include "Video.h"
#include <SDL/SDL.h> #include <SDL.h>
#include <iostream> #include <iostream>
using namespace std; using namespace std;

2
Video.h
View File

@ -2,7 +2,7 @@
#ifndef VIDEO_H #ifndef VIDEO_H
#define VIDEO_H #define VIDEO_H
#include <SDL/SDL.h> #include <SDL.h>
class Video class Video
{ {