Changeset 1e121f4 for _old/app/src/lem

Timestamp:

10/26/10 10:57:54 (14 years ago)

Author:

Adam Kędziora <s301614@…>

Branches:

master

Children:

a6e708f

Parents:

f712e16

git-author:

Adam Kędziora <s301614@…> (10/26/10 10:57:54)

git-committer:

Adam Kędziora <s301614@…> (10/26/10 10:57:54)

Message:

Replacing old implementation with working implementation

Location:

_old/app/src/lem

Files:

• Makefile (modified) (5 diffs)
• lem.cc (modified) (1 diff)

_old/app/src/lem/Makefile

@@ -1 @@
-PAR=-Wno-deprecated -m32 -O3 -fpermissive -static
-PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive -static
+PAR=-Wno-deprecated -O2 -fpermissive -static
+PAR2=-c -Wno-deprecated -O2 -fpermissive -static
 LIB_PATH=../lib
 COMMON_PATH=../common
@@ -6 +6 @@
 
 
-lem: main.cc lem.o  $(LIB_PATH)/auttools.o $(LIB_PATH)/word.o \
-      cmdline.c common_lem.o common.o symtab.o
+lem: main.cc lem.o auttools.o word.o cmdline.c common_lem.o common.o symtab.o
         g++ $(PAR) -D _CMDLINE_FILE=$(CMDLINE_FILE) \
         main.cc lem.o $(LIB_PATH)/auttools.o \
@@ -28 +27 @@
 #       g++ $(PAR2) $(LIB_PATH)/erro.cc
 
-common.o: $(COMMON_PATH)/cmdline_common.ggo $(COMMON_PATH)/common.cc \
-         $(COMMON_PATH)/common.h
+common.o: cmdline_common
         g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) $(COMMON_PATH)/common.cc
 
@@ -38 +36 @@
         gengetopt -i cmdline.ggo --conf-parser
 
-cmdline.ggo: cmdline_lem.ggo ../common/cmdline_common.ggo
+cmdline.ggo: cmdline_lem.ggo $(COMMON_PATH)/cmdline_common.ggo
         cat cmdline_lem.ggo ../common/cmdline_common.ggo > cmdline.ggo
 
@@ -55 +53 @@
         cp lem $(UTT_BIN_DIR)
 endif
+
+include $(COMMON_PATH)/common.mk
+include $(LIB_PATH)/lib.mk

_old/app/src/lem/lem.cc

@@ -1 +1 @@
 #include "lem.h"
 
-#include <stdlib.h>
 #include <assert.h>
+#include <cstdlib>
 
+
+
+using namespace std;
 
 /* Znajduje opisy slownikowe dla wyrazu.