diff --git a/mk/macosx/build-mg.sh b/mk/macosx/build-mg.sh index ee7e85015..c13051a4f 100755 --- a/mk/macosx/build-mg.sh +++ b/mk/macosx/build-mg.sh @@ -145,9 +145,7 @@ case $xcode_ver in 4.0*|4.1*|4.2*|4.3*) CMAKE_OSX_DEPLOYMENT_TARGET="10.6";; 4.*) CMAKE_OSX_DEPLOYMENT_TARGET="10.7";; 5.*) CMAKE_OSX_DEPLOYMENT_TARGET="10.8";; - 6.*) CMAKE_OSX_DEPLOYMENT_TARGET="10.9";; - 7.*) CMAKE_OSX_DEPLOYMENT_TARGET="10.10";; - # ^ last one expected for future + 6.0*|6.1*|6.2*) CMAKE_OSX_DEPLOYMENT_TARGET="10.9";; esac case $CMAKE_OSX_DEPLOYMENT_TARGET in 10.4*|10.5*) CMAKE_OSX_ARCHITECTURES="ppc;i386";; diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 8f199f6b7..fb56f6338 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -43,6 +43,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) # wxWidgets include (this will do all the magic to configure everything) include( ${wxWidgets_USE_FILE} ) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES}) + MESSAGE(STATUS " wxWidgets: ${wxWidgets_INCLUDE_DIRS} ;/; ${wxWidgets_LIBRARIES}") ELSE() SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.dll.a) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu_gl-2.8-i586-mingw32msvc.dll.a) diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index c345719de..eb29eec1e 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -32,6 +32,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) # wxWidgets include (this will do all the magic to configure everything) include( ${wxWidgets_USE_FILE} ) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${wxWidgets_LIBRARIES}) + MESSAGE(STATUS " wxWidgets: ${wxWidgets_INCLUDE_DIRS} ;/; ${wxWidgets_LIBRARIES}") ELSE() SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu-2.8-i586-mingw32msvc.dll.a) SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${PROJECT_SOURCE_DIR}/source/win32_deps/wxWidgets-2.8.10/lib/libwx_mswu_gl-2.8-i586-mingw32msvc.dll.a)