From c52404bf4516a5997760924d9e2864a1e0d97e1e Mon Sep 17 00:00:00 2001 From: nkorslund Date: Tue, 25 Aug 2009 14:37:40 +0000 Subject: [PATCH] Updated .gitignore Added -m32 switch for x86_64-i386 cross-compilation Signed-off-by: Josua Grawitter git-svn-id: https://openmw.svn.sourceforge.net/svnroot/openmw/trunk@128 ea6a568a-9f4f-0410-981a-c910a81bb256 --- .gitignore | 5 +++++ Makefile | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2e6fc6338..0d7378caa 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,8 @@ # /util/ /util/iconv + +*.o +*.patch +*.diff +.directory diff --git a/Makefile b/Makefile index 201b6f004..8cab900c7 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ # Designed for GNU Make # Compiler settings -CXXFLAGS?= -g -DMD=gdmd -version=Posix +CXXFLAGS?= -g -m32 +DMD=gdmd -version=Posix -m32 # Some extra flags for niftool and bsatool NIFFLAGS=-debug=warnstd -debug=check -debug=statecheck -debug=strict -debug=verbose # Linker flags -LFLAGS= -L-lopenal -L-lOgreMain -L-lOIS -L-lmygui -L-luuid -L-lavcodec -L-lavformat bullet/libbulletdynamics.a bullet/libbulletcollision.a bullet/libbulletmath.a +LFLAGS= -L-lopenal -L-lOgreMain -L-lOIS -L-lmygui -L-luuid -L-lavcodec -L-lavformat bullet/libbulletdynamics.a bullet/libbulletcollision.a bullet/libbulletmath.a -m32 # Compiler settings for Ogre, OIS and MyGUI # TODO: the -I when we're done