diff --git a/cpp/tex_parser/Makefile b/cpp/tex_parser/Makefile index 09efd13..fdf4011 100644 --- a/cpp/tex_parser/Makefile +++ b/cpp/tex_parser/Makefile @@ -1,5 +1,5 @@ -CC=cc -CXX=c++ +#CC=cc +CXX=g++ INCLUDE=-I$(HOME)/projects/include KOLAN_PROJECTS=$(HOME)/projects KOLAN_INCLUDE=$(KOLAN_PROJECTS)/include diff --git a/cpp/tex_parser/tex_table_class.geany b/cpp/tex_parser/tex_table_class.geany index 9a185d8..622db3d 100644 --- a/cpp/tex_parser/tex_table_class.geany +++ b/cpp/tex_parser/tex_table_class.geany @@ -16,8 +16,33 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=3 -FILE_NAME_0=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class_test.cpp;0 -FILE_NAME_1=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class.cpp;0 -FILE_NAME_2=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class.hpp;0 -FILE_NAME_3=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class_tags.hpp;0 +current_page=6 +FILE_NAME_0=176;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class_test.cpp;0 +FILE_NAME_1=1332;Make;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/Makefile;0 +FILE_NAME_2=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class.cpp;0 +FILE_NAME_3=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class.hpp;0 +FILE_NAME_4=0;C++;0;61;1;1;1;/home/kolan/dev/cpp/tex_parser/tex_table_class_tags.hpp;0 +FILE_NAME_5=0;C;0;16;1;1;1;/home/kolan/projects/include/xmalloc.c;0 +FILE_NAME_6=679;C;0;16;1;1;1;/home/kolan/projects/include/xmalloc.h;0 +FILE_NAME_7=146;C;0;16;1;1;1;/home/kolan/projects/include/xerror.h;0 + +[build-menu] +NF_00_LB=_Сделать +NF_00_CM=make +NF_00_WD=%p +NF_01_LB=Сделать заданную _цель +NF_01_CM=make +NF_01_WD=%p +NF_02_LB=Сделать _объект +NF_02_CM=make %e.o +NF_02_WD=%p +CFT_00_LB=_Скомпилировать +CFT_00_CM=gcc -Wall -c "%f" +CFT_00_WD=%p +CFT_01_LB=_Сборка +CFT_01_CM=gcc -Wall -o "%e" "%f" -lhash +CFT_01_WD=%p +CFT_02_LB= +CFT_02_CM= +CFT_02_WD=%p +filetypes=C; diff --git a/cpp/tex_parser/tex_table_class_test.cpp b/cpp/tex_parser/tex_table_class_test.cpp index fb5e5c9..61441da 100644 --- a/cpp/tex_parser/tex_table_class_test.cpp +++ b/cpp/tex_parser/tex_table_class_test.cpp @@ -1,13 +1,14 @@ #include #include -#include -#include #include -#include #include -#include "xerror.h" +//~ #include +//~ #include +//~ #include + #include "xmalloc.h" +#include "xerror.h" using namespace std;