Update of /cvsroot/playerstage/code/stage/libstage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27459/libstage
Modified Files:
CMakeLists.txt stage.cc
Log Message:
fixed 64-bit compatibility problem
Index: stage.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/stage.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stage.cc 18 Feb 2008 03:52:30 -0000 1.3
--- stage.cc 27 Feb 2008 22:51:12 -0000 1.4
***************
*** 235,240 ****
sscanf( line, "%d %d %d %n", &r, &g, &b, &chars_matched );
! stg_color_t col = ( 0xFF000000 | (r << 16) | (g << 8) | b);
!
// Read the name
char* colorname = strdup( line + chars_matched );
--- 235,242 ----
sscanf( line, "%d %d %d %n", &r, &g, &b, &chars_matched );
!
! stg_color_t* col = new stg_color_t;
! *col = ( 0xFF000000 | (r << 16) | (g << 8) | b);
!
// Read the name
char* colorname = strdup( line + chars_matched );
***************
*** 249,253 ****
// look up the colorname in the database
! return (stg_color_t)g_hash_table_lookup( table, name );
}
--- 251,260 ----
// look up the colorname in the database
! stg_color_t* found = (stg_color_t*)g_hash_table_lookup( table, name );
!
! if( found )
! return *found;
! else
! return (stg_color_t)0;
}
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstage/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CMakeLists.txt 27 Feb 2008 10:08:29 -0000 1.1
--- CMakeLists.txt 27 Feb 2008 22:51:12 -0000 1.2
***************
*** 3,17 ****
pkg_check_modules( GLIB gdk-pixbuf-2.0 )
- # hack to find FLTK on OS X using MacPorts
- SET(FLTK_INCLUDE_DIR /opt/local/include)
-
find_package(OPENGL REQUIRED)
find_package(FLTK REQUIRED)
! MESSAGE("hello")
! MESSAGE("FL INC ${FLTK_INCLUDE_DIR}")
! MESSAGE("FL LIBS ${FLTK_LIBRARIES}")
! MESSAGE("GL INC ${OPENGL_INCLUDE_DIR}")
! MESSAGE("GL LIBS ${OPENGL_LIBRARIES}")
include_directories( .
--- 3,20 ----
pkg_check_modules( GLIB gdk-pixbuf-2.0 )
find_package(OPENGL REQUIRED)
+
+ if(APPLE)
+ set(FLTK_INCLUDE_DIR /opt/local/include) # MacPorts' install path
+ endif(APPLE)
+
find_package(FLTK REQUIRED)
! message("FLTK")
! message(" include ${FLTK_INCLUDE_DIR}")
! message(" libs ${FLTK_LIBRARIES}")
! message("OpenGL")
! message(" include ${OPENGL_INCLUDE_DIR}")
! message(" libs ${OPENGL_LIBRARIES}")
include_directories( .
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
