Am 18.07.2010 um 12:12 schrieb Peter Kümmel: > Stephan Witt wrote: >> Am 18.07.2010 um 11:44 schrieb Pavel Sanda: >> >>> Stephan Witt wrote: >>>> scroll_whell_zoom = >>>> SCROLL_WHEEL_ZOOM_SHIFT; >>>> - else if (tmp == "option") >>>> - scroll_whell_zoom = >>>> SCROLL_WHEEL_ZOOM_OPTION; >>>> + else if (tmp == "alt") >>>> + scroll_whell_zoom = >>>> SCROLL_WHEEL_ZOOM_ALT; >>>> else { >>>> scroll_whell_zoom = >>>> SCROLL_WHEEL_ZOOM_OFF; >>>> if (tmp != "off" && tmp != "false") >>>> @@ -2604,8 +2604,8 @@ >>>> case SCROLL_WHEEL_ZOOM_SHIFT: >>>> status = "shift"; >>>> break; >>>> - case SCROLL_WHEEL_ZOOM_OPTION: >>>> - status = "option"; >>>> + case SCROLL_WHEEL_ZOOM_ALT: >>>> + status = "alt"; >>> maybe >>> >>> ifdef mac >>> status="option"; >>> endif >>> >>> to make everybody happy? >> >> My keyboard has that key labeled with "alt" too. So "alt" is valid too. (I >> as german speaker associate it with "old"... so I don't like it so much - >> but that's not important). >> >> This change is part one of the solution and platform independent. I'll >> commit the patch above now. >> The next step is to make the Mac specific changes. I'll prepare a patch and >> post it soon. But I can wait with that after alpha5. >> >> The more serious problem I see is that the recent changes with CMake broke >> the "Out-of-the-Box" build here. The deactivate of Aspell per default did >> not removed the "src/AspellChecker.cpp" file from the list off targets and >> the build failed. Maybe, this should be fixed before alpha5? Peter, is it >> really working for you? >> > > Out-of-the-Box aspell is disabled, and this compiles on win and linux. But it > could be that disabling aspell after > having it enabled makes problems. So does it help when you clean your build > folder and restart from scratch?
This is my CMake build script: ================================================ export CMAKE_OSX_ARCHITECTURES="i386" export CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386" export SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" export CMAKE_OSX_ARCHITECTURES="i386" export MACOSX_DEPLOYMENT_TARGET=10.5 rm -rf lyx-build/lyx-cmake mkdir lyx-build/lyx-cmake cd lyx-build/lyx-cmake && cmake ../../lyx-devel/development/cmake -G "Xcode" -Dquiet=1 -Dmerge=0\ -DLYX_DEBUG=ON -DLYX_RELEASE=OFF -DLYX_ASPELL=OFF -DLYX_PACKAGE_SUFFIX=OFF -DLYX_PROGRAM_SUFFIX=OFF # -Dno_aspell=1 -Dnls=1 mkdir -p bin && ln -s /Users/stephan/cvs/lyx/lyx-build/LyX-2.0.0svn.app/Contents/Resources bin ================================================ So every time I restart from scratch already. I have to, since the generated Xcode project has to recreated anyway and all my changes are lost. Currently here it is broken completely now. I have no clue what happens. But it may very well be my local problem. :-( The development/cmake tree is in sync with svn. Since this morning I could generate the project... % sh mkcmake.sh -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Checking whether C compiler has -isysroot -- Checking whether C compiler has -isysroot - yes -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Checking whether CXX compiler has -isysroot -- Checking whether CXX compiler has -isysroot - yes -- Check for working CXX compiler: /usr/bin/g++ -- Check for working CXX compiler: /usr/bin/g++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- -- Switch LYX_* variables by -DLYX_*=1 or 0: -- -- Switch LYX_* variables by -DLYX_*=1 or 0: -- -- LYX_NLS : OFF (Use nls) -- LYX_ASPELL : OFF (Require aspell) -- LYX_AIKSAURUS : OFF (Require Aiksaurus) -- LYX_ENCHANT : OFF (Require Enchant) -- LYX_HUNSPELL : OFF (Require Hunspell) -- LYX_DEBUG : ON (Build debug version) -- LYX_RELEASE : OFF (Build release version) -- LYX_PROFILE : OFF (Build profile version) -- LYX_USE_EXTERNAL_BOOST : OFF (Use external boost) -- LYX_USE_EXTERNAL_LIBINTL : ON (Use external libintl) -- LYX_INSTALL : OFF (Build install projects/rules) -- LYX_PACKAGE_SUFFIX : OFF (Use version suffix for packaging) -- LYX_PROGRAM_SUFFIX : OFF (Append version suffix to binaries) -- LYX_DISABLE_PCH : ON (Disable precompiled headers) -- LYX_MERGE_FILES : OFF (Merge source files into one compilation unit) -- LYX_DEBUG_GLIBC : OFF (Enable libstdc++ debug mode) -- LYX_DEBUG_GLIBC_PEDANTIC : OFF (Enable libstdc++pedantic debug mode) -- LYX_STDLIB_DEBUG : OFF (Use debug stdlib) -- LYX_CONCEPT_CHECKS : OFF (Enable concept-checks) -- LYX_QUIET : OFF (Don't generate verbose makefiles) -- LYX_SHARED_LIBRARIES : OFF (Build shared libraries) -- -- Using GCC version 4.2.1 -- Looking for Q_WS_X11 -- Looking for Q_WS_X11 - not found. -- Looking for Q_WS_MAC -- Looking for Q_WS_MAC - found -- Looking for Q_WS_WIN -- Looking for Q_WS_WIN - not found. -- Found Qt-Version 4.6.2 CMake Error at modules/FindICONV.cmake:72 (check_function_exists): Unknown CMake command "check_function_exists". Call Stack (most recent call first): CMakeLists.txt:249 (find_package) -- Configuring incomplete, errors occurred!