[BACK]Return to patch-CMakeLists_txt CVS log [TXT][DIR] Up to [local] / ports / games / megaglest / base / patches

Diff for /ports/games/megaglest/base/patches/Attic/patch-CMakeLists_txt between version 1.1 and 1.2

version 1.1, 2011/04/24 18:49:09 version 1.2, 2011/08/01 05:17:41
Line 1 
Line 1 
 $OpenBSD$  $OpenBSD$
 --- CMakeLists.txt.orig Wed Feb  2 23:08:57 2011  --- CMakeLists.txt.orig Sat Jul  9 05:57:19 2011
 +++ CMakeLists.txt      Sun Apr 10 16:08:17 2011  +++ CMakeLists.txt      Mon Aug  1 09:15:04 2011
 @@ -134,15 +134,6 @@ ENDIF()  @@ -68,7 +68,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
           SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3")
  ADD_SUBDIRECTORY( source/shared_lib )  
  ADD_SUBDIRECTORY( source/glest_game )  
 -#if(wxWidgets_FOUND)  
 -  ADD_SUBDIRECTORY( source/glest_map_editor )  
 -  ADD_SUBDIRECTORY( source/g3d_viewer )  
 -  ADD_SUBDIRECTORY( source/configurator )  
 -#else()  
 -#  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")  
 -#  MESSAGE(STATUS "map editor, g3d viewer, configurator")  
 -#endif()  
 -ADD_SUBDIRECTORY( source/tools/glexemel )  
   
  IF(APPLE)          # Release compiler flags
         include(mk/macosx/CMakeLists.txt)  -       SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE} -O3 ")
   +       SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
           SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")  ## Strip binary
   
           # Release with debug info compiler flags
   @@ -195,15 +195,15 @@ IF(EXISTS "${PROJECT_SOURCE_DIR}/source/")
   
           ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/shared_lib )
           ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_game )
   -       #if(wxWidgets_FOUND)
   -         ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
   -         ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
   -         ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
   -       #else()
   -       #  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
   -       #  MESSAGE(STATUS "map editor, g3d viewer, configurator")
   -       #endif()
   -       ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
   +#      #if(wxWidgets_FOUND)
   +#        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/glest_map_editor )
   +#        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/g3d_viewer )
   +#        ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/configurator )
   +#      #else()
   +#      #  MESSAGE(STATUS "WARNING... the following game tools will NOT be built since we cannot find wxWidgets on this machine")
   +#      #  MESSAGE(STATUS "map editor, g3d viewer, configurator")
   +#      #endif()
   +#      ADD_SUBDIRECTORY( ${PROJECT_SOURCE_DIR}/source/tools/glexemel )
   
           IF(APPLE)
                   include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt)

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

CVSweb