Marcussacapuces91
commented
13 years ago OK pour la casse ; par contre pour la makefile, je vais regarder ça car je ne sais pas faire un diff sur W$ 7 ; qui plus est, comme j'utilise un IDE de développement (Code::Blocks 10.05 pour le citer), le makefile est généré automatiquement pour mon environnement.
diff --git a/Makefile b/Makefile index dbecc07..d35c864 100644 --- a/Makefile +++ b/Makefile @@ -3,31 +3,38 @@ OPTIONS=-g -DDEBUG CC=gcc CPP=g++ CFLAGS=-I/usr/local/include -I/opt/include -Wall -W -ansi -pedantic $(OPTIONS) -CXXFLAGS=-I/usr/local/include -I/opt/include -I./libspatialite/headers -Wall -W -ansi -pedantic -Wno-long-long $(OPTIONS) +CXXFLAGS=-I/usr/local/include -I/opt/include -I${PWD} -Wall -W -ansi -pedantic -Wno-long-long $(OPTIONS) LDFLAGS=-L./obj -L/opt/lib -L/usr/local/lib EXEC=parser -LIBS=-ldl -lstdc++ -lpthread -lgeos -lgeos_c -lproj -lexpat +LIBS=-ldl -lstdc++ -lpthread -lgeos -lgeos_c -lproj -lexpat -lspatialite #-lspatialite SRC_OSM=changeset.cpp element.cpp member.cpp node.cpp point.cpp relation.cpp top.cpp way.cpp -SRC_XML=parserbounds.cpp parser.cpp parsernd.cpp parserosmchange.cpp parserplanet.cpp parsertag.cpp parserchangeset.cpp parsermember.cpp parsernode.cpp parserosm.cpp parserrelation.cpp parserway.cpp +SRC_XML=parserbounds.cpp parser.cpp parsernd.cpp parserosmchange.cpp parserplanet.cpp parsertag.cpp parserchangeset.cpp parsermember.cpp parsernode.cpp parserosm.cpp parserrelation.cpp parserway.cpp parsercreate.cpp parsermodify.cpp parserdelete.cpp SRC_SPLT=spatialite.c sqlite3.c -SRC_MAIN= baseosm.cpp basesqlite3.cpp main.cpp spatialite.cpp +SRC_BASE= baseosm.cpp basesqlite3.cpp basesqlite3threaded.cpp wrapper_spatialite.cpp +SRC_ASYNC=sqlite3async.c +SRC_EXEC= osm2sqlite.cpp # basefreeroute.cpp OBJ_OSM=$(SRC_OSM:%.cpp=osm/%.o) OBJ_XML=$(SRC_XML:%.cpp=xml/%.o) -OBJ_SPLT=$(SRC_SPLT:%.c=libspatialite/%.o) -OBJ_MAIN=$(SRC_MAIN:%.cpp=%.o) +# OBJ_SPLT=$(SRC_SPLT:%.c=libspatialite/%.o) +OBJ_BASE=$(SRC_BASE:%.cpp=base/%.o) +OBJ_ASYNC=$(SRC_ASYNC:%.c=base/async/%.o) +OBJ_EXEC=$(SRC_EXEC:%.cpp=%.o) -OBJ=$(OBJ_OSM) $(OBJ_XML) $(OBJ_SPLT) $(OBJ_MAIN) +OBJ=$(OBJ_OSM) $(OBJ_XML) $(OBJ_SPLT) $(OBJ_BASE) ${OBJ_ASYNC} ${OBJ_EXEC} all: $(EXEC) $(EXEC): $(OBJ) $(CPP) -o $@ $(OBJ) $(LDFLAGS) $(LIBS) -%.o: %.cpp %.h +.c.o: %.c %.h + $(CC) -c $< -o $@ $(CFLAGS) + +.cpp.o: %.cpp %.h $(CPP) -c $< -o $@ $(CXXFLAGS) clean: diff --git a/xml/parsermodify.h b/xml/parsermodify.h index 6df8835..4253239 100644 --- a/xml/parsermodify.h +++ b/xml/parsermodify.h @@ -28,7 +28,7 @@ #include "parserconteneurelement.h" // header de l'interface héritée. #include "baseinterface.h" -#include "../Exception.h" +#include "../exception.h" /** * \brief Classe analysant un flux XML commençant à l'élément 'modify'.