updated colladadom include directories in makefile
This commit is contained in:
parent
f53e2c0e6b
commit
7d260dc855
|
@ -29,7 +29,6 @@ installed: wiped $(SOURCE_DIR)/unpacked
|
||||||
@echo "making it"
|
@echo "making it"
|
||||||
cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
|
cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
|
||||||
cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/
|
cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/
|
||||||
mv $(ROOT)/include/1.5/dom $(ROOT)/include/dom
|
|
||||||
cp -rf $(SOURCE_DIR)/dom/build/$(OS)-1.5/*.* $(ROOT)/lib/
|
cp -rf $(SOURCE_DIR)/dom/build/$(OS)-1.5/*.* $(ROOT)/lib/
|
||||||
touch installed
|
touch installed
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
<rosdep name="unzip"/>
|
<rosdep name="unzip"/>
|
||||||
<rosdep name="pcre"/>
|
<rosdep name="pcre"/>
|
||||||
<export>
|
<export>
|
||||||
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lcollada15dom -lminizip `rosboost-cfg --lflags system` `rosboost-cfg --lflags filesystem`" cflags="-I${prefix}/include `rosboost-cfg --cflags`"/>
|
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lcollada15dom -lminizip `rosboost-cfg --lflags system` `rosboost-cfg --lflags filesystem`" cflags="-I${prefix}/include -I${prefix}/include/1.5 `rosboost-cfg --cflags`"/>
|
||||||
<cpp os="osx" lflags="-F${prefix}/lib -framework Collada15Dom" cflags="-I${prefix}/include"/>
|
<cpp os="osx" lflags="-F${prefix}/lib -framework Collada15Dom" cflags="-I${prefix}/include -I${prefix}/include/1.5"/>
|
||||||
</export>
|
</export>
|
||||||
<platform os="ubuntu" version="9.04"/>
|
<platform os="ubuntu" version="9.04"/>
|
||||||
<platform os="ubuntu" version="9.10"/>
|
<platform os="ubuntu" version="9.10"/>
|
||||||
|
|
Loading…
Reference in New Issue