Revision: 8423
http://playerstage.svn.sourceforge.net/playerstage/?rev=8423&view=rev
Author: natepak
Date: 2009-11-19 19:18:09 +0000 (Thu, 19 Nov 2009)
Log Message:
-----------
Fixed build process
Modified Paths:
--------------
code/gazebo/trunk/3rd_party/CMakeLists.txt
code/gazebo/trunk/server/gui/Toolbar.cc
Modified: code/gazebo/trunk/3rd_party/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/3rd_party/CMakeLists.txt 2009-11-19 17:46:36 UTC (rev
8422)
+++ code/gazebo/trunk/3rd_party/CMakeLists.txt 2009-11-19 19:18:09 UTC (rev
8423)
@@ -1 +1,18 @@
+include_directories(
+ ${LIBAVCODEC_PATH}
+ ${LIBAVFORMAT_PATH}
+ ${libtool_include_path}
+ ${gazeboserver_include_dirs}
+ ${boost_include_dirs}
+ ${freeimage_include_dir}
+ ${bullet_include_dir}
+ ${threadpool_include_dirs_split}
+ ${FLTK_INCLUDE_DIR}
+)
+
+link_directories(
+ ${boost_library_dirs}
+ ${freeimage_library_dir}
+)
+
add_subdirectory(assimp)
Modified: code/gazebo/trunk/server/gui/Toolbar.cc
===================================================================
--- code/gazebo/trunk/server/gui/Toolbar.cc 2009-11-19 17:46:36 UTC (rev
8422)
+++ code/gazebo/trunk/server/gui/Toolbar.cc 2009-11-19 19:18:09 UTC (rev
8423)
@@ -29,7 +29,7 @@
#include <FL/Fl_Button.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Bitmap.H>
-#include <FL/Fl_RGB_Image.H>
+#include <FL/Fl_Image.H>
#include "Image.hh"
#include "Gui.hh"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
