This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/USER-OMP/Install.sh b/src/USER-OMP/Install.sh | |
| old mode 100644 | |
| new mode 100755 | |
| index b37fd00..dd87e8b | |
| --- a/src/USER-OMP/Install.sh | |
| +++ b/src/USER-OMP/Install.sh | |
| @@ -4,7 +4,7 @@ | |
| # do not install child files if parent does not exist | |
| for file in *_omp.cpp *_omp.h ; do |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/variable.cpp b/src/variable.cpp | |
| index d60accc..b52220c 100644 | |
| --- a/src/variable.cpp | |
| +++ b/src/variable.cpp | |
| @@ -43,7 +43,7 @@ using namespace MathConst; | |
| #define MYROUND(a) (( a-floor(a) ) >= .5) ? ceil(a) : floor(a) | |
| -enum{INDEX,LOOP,WORLD,UNIVERSE,ULOOP,STRING,FILEVAR,EQUAL,ATOM}; | |
| +enum{INDEX,LOOP,WORLD,UNIVERSE,ULOOP,STRING,FILEVAR,EQUAL,ATOM,ENVIRONMENT}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/python/lammps.py b/python/lammps.py | |
| index c65e84c..b2b28a2 100644 | |
| --- a/python/lammps.py | |
| +++ b/python/lammps.py | |
| @@ -23,8 +23,8 @@ class lammps: | |
| # if name = "g++", load liblammps_g++.so | |
| try: | |
| - if not name: self.lib = CDLL("liblammps.so",RTLD_GLOBAL) | |
| - else: self.lib = CDLL("liblammps_%s.so" % name,RTLD_GLOBAL) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/MAKE/Makefile.mac b/src/MAKE/Makefile.mac | |
| index 42f5882..2f0f42a 100755 | |
| --- a/src/MAKE/Makefile.mac | |
| +++ b/src/MAKE/Makefile.mac | |
| @@ -6,18 +6,18 @@ SHELL = /bin/sh | |
| # compiler/linker settings | |
| # specify flags and libraries needed for your compiler | |
| -CC = c++ | |
| -CCFLAGS = -O |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/MAKE/Makefile.mac b/src/MAKE/Makefile.mac | |
| index ccefa59..42f5882 100755 | |
| --- a/src/MAKE/Makefile.mac | |
| +++ b/src/MAKE/Makefile.mac | |
| @@ -48,9 +48,9 @@ MPI_LIB = -lmpi_stubs | |
| # PATH = path for FFT library | |
| # LIB = name of FFT library | |
| -FFT_INC = -DFFT_FFTW | |
| +FFT_INC = -DFFT_NONE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/config.guess b/config.guess | |
| index d622a44..5dd0df7 100755 | |
| --- a/config.guess | |
| +++ b/config.guess | |
| @@ -1219,6 +1219,12 @@ EOF | |
| SX-8R:SUPER-UX:*:*) | |
| echo sx8r-nec-superux${UNAME_RELEASE} | |
| exit ;; | |
| + SX-9:SUPER-UX:*:*) | |
| + echo sx9-nec-superux${UNAME_RELEASE} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| # fix the configure files | |
| patch -p1 config.guess < fix-config-sx9.diff | |
| # make the build directory | |
| mkdir -p builder | |
| cd builder | |
| # configure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/setup.py b/setup.py | |
| index 6b47451..0bfca0c 100644 | |
| --- a/setup.py | |
| +++ b/setup.py | |
| @@ -620,7 +620,7 @@ class PyBuildExt(build_ext): | |
| missing.extend(['imageop']) | |
| # readline | |
| - do_readline = self.compiler.find_library_file(lib_dirs, 'readline') | |
| + do_readline = '/usr/local/opt/readline/lib/libhistory.dylib' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/setup.py b/setup.py | |
| index 6b47451..51cc779 100644 | |
| --- a/setup.py | |
| +++ b/setup.py | |
| @@ -1702,9 +1702,9 @@ class PyBuildExt(build_ext): | |
| # AquaTk is a separate method. Only one Tkinter will be built on | |
| # Darwin - either AquaTk, if it is found, or X11 based Tk. | |
| platform = self.get_platform() | |
| - if (platform == 'darwin' and | |
| - self.detect_tkinter_darwin(inc_dirs, lib_dirs)): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- pymol/modules/pmg_tk/skins/normal/__init__.py 2012-12-13 01:19:10.000000000 +0900 | |
| +++ pymol_new/modules/pmg_tk/skins/normal/__init__.py 2012-12-13 01:15:42.000000000 +0900 | |
| @@ -250,7 +250,7 @@ | |
| self.buttonArea.destroy() | |
| def my_show(self,win,center=1): | |
| - if sys.platform!='linux2': | |
| + if (sys.platform!='linux2') and (sys.platform!='darwin'): | |
| win.show() | |
| else: # autocenter, deiconify, and run mainloop |