more cmake support for examples

examples/OpenGLWindow/CMakeLists.txt

@@ -19,9 +19,9 @@ LIST(REMOVE_ITEM OpenGLWindowCommon_CPP X11OpenGLWindow.cpp )
 #MESSAGE (${OpenGLWindowCommon_CPP})
 
 IF (WIN32)
-	SET(OpenGLWindow_SRCS GlewWindows/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP})	
+	SET(OpenGLWindow_SRCS ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP})	
 	INCLUDE_DIRECTORIES(
-				GlewWindows
+				${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
 	)
 	ADD_DEFINITIONS(-DGLEW_STATIC)
 ENDIF(WIN32)
@@ -33,13 +33,13 @@ ENDIF(APPLE)
 #no Linux detection?
 IF(NOT WIN32 AND NOT APPLE)
 	INCLUDE_DIRECTORIES(
-                                GlewWindows
+					${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew
         )
         ADD_DEFINITIONS(-DGLEW_STATIC)
 	ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
         ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
 
-	SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} GlewWindows/glew.c ${OpenGLWindowCommon_CPP} )
+	SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowCommon_CPP} )
 ENDIF()
 
 

examples/OpenGLWindow/Win32Window.cpp

@@ -113,7 +113,7 @@ int getAsciiCodeFromVirtualKeycode(int virtualKeyCode)
 	return keycode;
 }
 
-bool Win32Window::isModifiedKeyPressed(int key)
+bool Win32Window::isModifierKeyPressed(int key)
 {
 	bool isPressed = false;
 

examples/OpenGLWindow/Win32Window.h

@@ -23,7 +23,7 @@ struct InternalData2;
 
 #include "../CommonInterfaces/CommonWindowInterface.h"
 
-class Win32Window : public b3gWindowInterface
+class Win32Window : public CommonWindowInterface
 {
 	protected:
 		
@@ -80,7 +80,7 @@ public:
 
 	virtual	void setWindowTitle(const char* title);
 
-	virtual bool	isModifiedKeyPressed(int key);
+	virtual bool	isModifierKeyPressed(int key);
 };
 
 #endif //_WIN32_WINDOW_H