ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-09-22 17:52:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tcl_tk_8610' into 'master'

Browse Source 
Tcl tk 8610

See merge request jschoeberl/netgen!228
This commit is contained in:
Joachim Schöberl 2019-09-03 22:10:08 +00:00
commit 63e6147969
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/external_projects/tcltk.cmake
View File

@ -1,10 +1,12 @@
if(APPLE) if(APPLE)
set(tcl_prefix ${CMAKE_INSTALL_PREFIX}) set(tcl_prefix ${CMAKE_INSTALL_PREFIX})
# URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tcl8.6.9-src.tar.gz"
# URL_MD5 aa0a121d95a0e7b73a036f26028538d4
ExternalProject_Add(project_tcl ExternalProject_Add(project_tcl
URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tcl8.6.9-src.tar.gz" URL "https://core.tcl-lang.org/tcl/tarball/87e71bd13b/tcl-87e71bd13b.tar.gz"
URL_MD5 aa0a121d95a0e7b73a036f26028538d4 URL_MD5 6f3393b9598fd32d5acb23b22dac9701
DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
UPDATE_COMMAND "" # Disable update UPDATE_COMMAND bash -c "cd ../project_tcl/macosx && autoconf"
CONFIGURE_COMMAND ../project_tcl/macosx/configure --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin CONFIGURE_COMMAND ../project_tcl/macosx/configure --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin
BUILD_COMMAND make -j4 binaries libraries BUILD_COMMAND make -j4 binaries libraries
INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers
@ -14,12 +16,14 @@ if(APPLE)
LOG_INSTALL 1 LOG_INSTALL 1
) )
# URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tk8.6.9.1-src.tar.gz"
# URL_MD5 9efe3976468352dc894dae0c4e785a8e
ExternalProject_Add(project_tk ExternalProject_Add(project_tk
DEPENDS project_tcl DEPENDS project_tcl
URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tk8.6.9.1-src.tar.gz" URL "https://mirror1.tcl.tk/tk/tarball/e23f0c31ac/tk-e23f0c31ac.tar.gz"
URL_MD5 9efe3976468352dc894dae0c4e785a8e URL_MD5 c973bcaedc82103deae2d78eede84a2e
DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
UPDATE_COMMAND "" # Disable update UPDATE_COMMAND bash -c "cd ../project_tk/macosx && autoconf"
CONFIGURE_COMMAND ../project_tk/macosx/configure --enable-aqua=yes --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin --with-tcl=${tcl_prefix}/Contents/Frameworks/Tcl.framework CONFIGURE_COMMAND ../project_tk/macosx/configure --enable-aqua=yes --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin --with-tcl=${tcl_prefix}/Contents/Frameworks/Tcl.framework
BUILD_COMMAND make -j4 binaries libraries BUILD_COMMAND make -j4 binaries libraries
INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers

1
ng/Togl2.1/togl.h
View File

@ -48,6 +48,7 @@
# if defined(TOGL_AGL) # if defined(TOGL_AGL)
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
# elif defined(TOGL_NSOPENGL) # elif defined(TOGL_NSOPENGL)
#define GL_SILENCE_DEPRECATION
# include <OpenGL/OpenGL.h> # include <OpenGL/OpenGL.h>
# include <OpenGL/gl.h> # include <OpenGL/gl.h>
# else # else

2
ng/drawing.tcl
View File

@ -40,7 +40,7 @@ if { [Ng_GetToglVersion] == 2 } {
if { $toglok == 1} { if { $toglok == 1} {
# #
pack .ndraw -expand true -fill both -padx 10 -pady 10 pack .ndraw -expand true -fill both -padx 0 -pady 0
catch { tkdnd::drop_target register .ndraw DND_Files } catch { tkdnd::drop_target register .ndraw DND_Files }
# #
bind .ndraw <Button-1> { bind .ndraw <Button-1> {