diff options
Diffstat (limited to 'ZKTest')
-rw-r--r-- | ZKTest/.cproject | 12 | ||||
-rw-r--r-- | ZKTest/Release/makefile | 2 | ||||
-rw-r--r-- | ZKTest/Release/objects.mk | 2 | ||||
-rw-r--r-- | ZKTest/Release/src/subdir.mk | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/ZKTest/.cproject b/ZKTest/.cproject index de38b07..b21a0e1 100644 --- a/ZKTest/.cproject +++ b/ZKTest/.cproject @@ -87,12 +87,17 @@ <targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1643218951" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/> <builder buildPath="${workspace_loc:/ZKTest}/Release" id="cdt.managedbuild.target.gnu.builder.exe.release.2036168266" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/> <tool id="cdt.managedbuild.tool.gnu.archiver.base.372775253" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> - <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.308803272" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"> + <tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.308803272" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"> <option id="gnu.cpp.compiler.exe.release.option.optimization.level.49146104" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option id="gnu.cpp.compiler.exe.release.option.debugging.level.1964167130" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> <option id="gnu.cpp.compiler.option.include.paths.33323844" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value="/usr/include/zookeeper"/> </option> + <option id="gnu.cpp.compiler.option.preprocessor.def.861023916" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols"> + <listOptionValue builtIn="false" value="__GXX_EXPERIMENTAL_CXX0X__"/> + </option> + <option id="gnu.cpp.compiler.option.dialect.std.1162125609" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/> + <option id="gnu.cpp.compiler.option.other.other.1881395024" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++0x" valueType="string"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1259315012" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> </tool> <tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.1571826105" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"> @@ -106,7 +111,10 @@ <tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.1415822815" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/> <tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.2092160826" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"> <option id="gnu.cpp.link.option.libs.765426599" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> - <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="/usr/lib/x86_64-linux-gnu/libzookeeper_mt.a"/> + <listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="zookeeper_mt"/> + </option> + <option id="gnu.cpp.link.option.paths.1709176627" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths"> + <listOptionValue builtIn="false" value="/usr/lib/x86_64-linux-gnu/"/> </option> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.918681803" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> diff --git a/ZKTest/Release/makefile b/ZKTest/Release/makefile index 7daa8b5..6e2c718 100644 --- a/ZKTest/Release/makefile +++ b/ZKTest/Release/makefile @@ -44,7 +44,7 @@ all: ZKTest ZKTest: $(OBJS) $(USER_OBJS) @echo 'Building target: $@' @echo 'Invoking: GCC C++ Linker' - g++ -o "ZKTest" $(OBJS) $(USER_OBJS) $(LIBS) + g++ -L/usr/lib/x86_64-linux-gnu/ -o "ZKTest" $(OBJS) $(USER_OBJS) $(LIBS) @echo 'Finished building target: $@' @echo ' ' diff --git a/ZKTest/Release/objects.mk b/ZKTest/Release/objects.mk index 5493f02..81bf874 100644 --- a/ZKTest/Release/objects.mk +++ b/ZKTest/Release/objects.mk @@ -4,5 +4,5 @@ USER_OBJS := -LIBS := -l/usr/lib/x86_64-linux-gnu/libzookeeper_mt.a +LIBS := -lzookeeper_mt diff --git a/ZKTest/Release/src/subdir.mk b/ZKTest/Release/src/subdir.mk index 399029d..875bb83 100644 --- a/ZKTest/Release/src/subdir.mk +++ b/ZKTest/Release/src/subdir.mk @@ -17,7 +17,7 @@ CPP_DEPS += \ src/%.o: ../src/%.cpp @echo 'Building file: $<' @echo 'Invoking: GCC C++ Compiler' - g++ -I/usr/include/zookeeper -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + g++ -D__GXX_EXPERIMENTAL_CXX0X__ -I/usr/include/zookeeper -O3 -Wall -c -fmessage-length=0 -std=c++0x -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' |