diff --git a/.gitignore b/.gitignore index b0a5160..df27c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bin* -*.o \ No newline at end of file +*.o +.settings* \ No newline at end of file diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index fc39223..aaa2b7b 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/Makefile b/Makefile index 4cf7f84..fc6ec2a 100644 --- a/Makefile +++ b/Makefile @@ -31,18 +31,18 @@ all: mkdir -p $(BIN32_DIR) mkdir -p $(BIN64_DIR) ifndef ARCH - $(MAKE) clean_objects - $(MAKE) -e ARCH=64 $(MAKE) clean_objects $(MAKE) -e ARCH=32 + $(MAKE) clean_objects + $(MAKE) -e ARCH=64 else $(MAKE) clean_objects $(MAKE) $(TARGET) endif install: - cp $(TARGET64) $(LIB64_PATH) cp $(TARGET32) $(LIB32_PATH) + cp $(TARGET64) $(LIB64_PATH) ftgl/distance-field.o : CFLAGS+=-w ftgl/edtaa3func.o : CFLAGS+=-w