From 7bed30fe7b80d29bc4822f7fd44163fa37a454fd Mon Sep 17 00:00:00 2001 From: tom Date: Wed, 14 Dec 2011 18:37:27 +0100 Subject: [PATCH] poprawione Makefile (wyrzucone -m32) lem, cor, kor, gue kompiluja sie (ubuntu 11.04 amd64) --- _old/app/src/cor/Makefile | 4 ++-- _old/app/src/gue/Makefile | 4 ++-- _old/app/src/kor/Makefile | 8 +++----- _old/app/src/kor/cmdline_cor.ggo | 0 _old/app/src/kor/common_cor.cc | 0 _old/app/src/kor/common_cor.h | 0 _old/app/src/kor/corlist.cc | 0 _old/app/src/kor/corlist.h | 0 _old/app/src/kor/corr.cc | 0 _old/app/src/kor/corr.hh | 0 _old/app/src/kor/main.cc | 0 _old/app/src/lem/Makefile | 4 ++-- _old/app/src/lib/Makefile | 4 ++-- 13 files changed, 11 insertions(+), 13 deletions(-) mode change 100755 => 100644 _old/app/src/kor/Makefile mode change 100755 => 100644 _old/app/src/kor/cmdline_cor.ggo mode change 100755 => 100644 _old/app/src/kor/common_cor.cc mode change 100755 => 100644 _old/app/src/kor/common_cor.h mode change 100755 => 100644 _old/app/src/kor/corlist.cc mode change 100755 => 100644 _old/app/src/kor/corlist.h mode change 100755 => 100644 _old/app/src/kor/corr.cc mode change 100755 => 100644 _old/app/src/kor/corr.hh mode change 100755 => 100644 _old/app/src/kor/main.cc diff --git a/_old/app/src/cor/Makefile b/_old/app/src/cor/Makefile index 08b9a70..f2daf1a 100644 --- a/_old/app/src/cor/Makefile +++ b/_old/app/src/cor/Makefile @@ -1,5 +1,5 @@ -PAR=-Wno-deprecated -m32 -fpermissive -static -PAR2=-c -Wno-deprecated -m32 -fpermissive +PAR=-Wno-deprecated -fpermissive -static +PAR2=-c -Wno-deprecated -fpermissive LIB_PATH=../lib COMMON_PATH=../common CMDLINE_FILE='"../cor/cmdline.h"' diff --git a/_old/app/src/gue/Makefile b/_old/app/src/gue/Makefile index abd1da5..ceebea0 100644 --- a/_old/app/src/gue/Makefile +++ b/_old/app/src/gue/Makefile @@ -1,5 +1,5 @@ -PAR=-Wno-deprecated -O3 -fpermissive -m32 -static -PAR2=-c -Wno-deprecated -O3 -fpermissive -m32 +PAR=-Wno-deprecated -O3 -fpermissive -static +PAR2=-c -Wno-deprecated -O3 -fpermissive LIB_PATH=../lib COMMON_PATH=../common CMDLINE_FILE='"../gue/cmdline.h"' diff --git a/_old/app/src/kor/Makefile b/_old/app/src/kor/Makefile old mode 100755 new mode 100644 index 68113a9..ad9830b --- a/_old/app/src/kor/Makefile +++ b/_old/app/src/kor/Makefile @@ -1,5 +1,5 @@ -PAR=-Wno-deprecated -m32 -fpermissive -static -PAR2=-c -Wno-deprecated -m32 -fpermissive +PAR=-Wno-deprecated -fpermissive -static +PAR2=-c -Wno-deprecated -fpermissive LIB_PATH=../lib COMMON_PATH=../common CMDLINE_FILE='"../kor/cmdline.h"' @@ -13,11 +13,9 @@ kor: main.cc corr.o corlist.o cmdline.o $(LIB_PATH)/word.o \ corr.o: corr.cc corr.hh cmdline.h g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corr.cc - + corlist.o: corlist.cc corlist.h cmdline.h g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) corlist.cc - - common.o: cmdline.h $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \ $(COMMON_PATH)/common.h diff --git a/_old/app/src/kor/cmdline_cor.ggo b/_old/app/src/kor/cmdline_cor.ggo old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/common_cor.cc b/_old/app/src/kor/common_cor.cc old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/common_cor.h b/_old/app/src/kor/common_cor.h old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/corlist.cc b/_old/app/src/kor/corlist.cc old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/corlist.h b/_old/app/src/kor/corlist.h old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/corr.cc b/_old/app/src/kor/corr.cc old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/corr.hh b/_old/app/src/kor/corr.hh old mode 100755 new mode 100644 diff --git a/_old/app/src/kor/main.cc b/_old/app/src/kor/main.cc old mode 100755 new mode 100644 diff --git a/_old/app/src/lem/Makefile b/_old/app/src/lem/Makefile index a04fde9..e9fec96 100644 --- a/_old/app/src/lem/Makefile +++ b/_old/app/src/lem/Makefile @@ -1,5 +1,5 @@ -PAR=-Wno-deprecated -m32 -O3 -fpermissive -static -PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive -static +PAR=-Wno-deprecated -O3 -fpermissive -static +PAR2=-c -Wno-deprecated -O3 -fpermissive -static LIB_PATH=../lib COMMON_PATH=../common CMDLINE_FILE='"../lem/cmdline.h"' diff --git a/_old/app/src/lib/Makefile b/_old/app/src/lib/Makefile index 708f12d..2a0362b 100644 --- a/_old/app/src/lib/Makefile +++ b/_old/app/src/lib/Makefile @@ -1,5 +1,5 @@ -PAR=-Wno-deprecated -m32 -O3 -PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive +PAR=-Wno-deprecated -O3 +PAR2=-c -Wno-deprecated -O3 -fpermissive # -static LIB_PATH=../lib COMMON_PATH=../common