Merging changes from trunk r58091-58323.
authorMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Wed, 17 Jul 2013 01:40:26 +0000 (01:40 +0000)
1  2 
CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
@@@ -59,16 -59,27 +59,16 @@@ set(INC_SY
        ${ZLIB_INCLUDE_DIRS}
  )
  
- set(SRC 
+ set(SRC
        GPC_Canvas.cpp
 -      GPC_Engine.cpp
        GPC_KeyboardDevice.cpp
        GPC_MouseDevice.cpp
 -      GPC_RawImage.cpp
 -      GPC_RawLoadDotBlendArray.cpp
 -      GPC_RawLogoArrays.cpp
        GPC_RenderTools.cpp
 -      GPC_System.cpp
 -      bmfont.cpp
  
        GPC_Canvas.h
 -      GPC_Engine.h
        GPC_KeyboardDevice.h
        GPC_MouseDevice.h
 -      GPC_RawImage.h
 -      GPC_RawLoadDotBlendArray.h
 -      GPC_RawLogoArrays.h
        GPC_RenderTools.h
 -      GPC_System.h
  )
  
  add_definitions(-DGLEW_STATIC)