Changeset 1e121f4 for _old/app/src/tok.c

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/tok.c

Files:

• Makefile (modified) (3 diffs)
• cmdline_tok.ggo (modified) (1 diff)
• common_tok.cc (modified) (1 diff)

_old/app/src/tok.c/Makefile

@@ -1 @@
-PAR=-Wno-deprecated -O3
+PAR=-Wno-deprecated -O3 -fpermissive
 PAR2=-c -Wno-deprecated -O3
 LIB_PATH=../lib
+COMMON_PATH=../common
 CMDLINE_FILE='"../tok.c/cmdline.h"'
 
@@ -15 +16 @@
         g++ $(PAR2) -D _CMDLINE_FILE=$(CMDLINE_FILE) common_tok.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
 
-cmdline.ggo: cmdline_tok.ggo ../common/cmdline_common.ggo
-        cat cmdline_tok.ggo ../common/cmdline_common.ggo > cmdline.ggo
+cmdline.ggo: cmdline_tok.ggo $(COMMON_PATH)/cmdline_common.ggo
+        cat cmdline_tok.ggo $(COMMON_PATH)/cmdline_common.ggo > cmdline.ggo
 
 cmdline.c cmdline.h: cmdline.ggo
@@ -32 +32 @@
 
 clean: clean.cmdline
-        rm *.o
+        rm *.o || true
+        rm tok || true
 
 clean.cmdline:
         rm cmdline.*
+
+include $(COMMON_PATH)/common.mk
+include $(LIB_PATH)/lib.mk

_old/app/src/tok.c/cmdline_tok.ggo

@@ -2 +2 @@
 version "0.1"
 
+option "dictionary"             d       "Dictionary" string typestr="FILENAME" default="cor.bin" no
 

_old/app/src/tok.c/common_tok.cc

@@ -1 @@
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include "common_tok.h"
+
+using namespace std;
 
 char dictionary[255];