Changeset 253
- Timestamp:
- Mar 4, 2011 4:29:22 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimgGUI.py
r251 r253 194 194 msg = \ 195 195 '''Select > 4 points on 1st used ring of image pattern. 196 Click right mouse button to select point.197 Use left mouse button to delete point.196 Click left mouse button to select point. 197 Use right mouse button to delete point. 198 198 Press OK when done''' 199 199 dlg = wx.MessageDialog(self,msg,'Pick inner ring',wx.OK) -
trunk/fsource/Makefile
r201 r253 1 # build the compiled fortran codes needed by GSAS-II 1 # build the compiled fortran codes needed by GSAS-II with f2py 2 # This is a work in progress. The idea is that files built here are placed in 3 # the bin directory, which is empty in the svn distribution. If these files will 4 # be distributed, they should be moved to a directory named bin<os><ver> where 5 # <os> is linux, mac or win and 2 6 3 BIN = .. \\bin7 BIN = ../bin 4 8 LIBS = $(BIN)/pack_f.$(SUFFIX) $(BIN)/pyspg.$(SUFFIX) $(BIN)/polymask.$(SUFFIX) $(BIN)/histogram2d.$(SUFFIX) $(BIN)/pypowder.$(SUFFIX) 5 9 SYMLIB := $(wildcard spsubs/*.for) … … 9 13 #---------------------------------------------------------------------- 10 14 # linux (gfortran) 11 #GSASlib = ./libgsas.a12 15 #COMPILER=--fcompiler=gnu95 13 16 #PACKCOPTS=--f77flags="-fno-range-check" … … 18 21 #---------------------------------------------------------------------- 19 22 # mac (gfortran) 20 #GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a 21 #COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran 22 #PACKCOPTS=--f77flags="-fno-range-check" 23 #SUFFIX=so 24 #F2PY=f2py 25 #MOVE=mv 26 #DEL=\# 23 COMPILER=--fcompiler=gnu95 --f77exec=/sw/bin/gfortran 24 PACKCOPTS=--f77flags="-fno-range-check" # -static-libgfortran -static-libgcc 25 SUFFIX=so 26 F2PY=f2py 27 MOVE=mv 28 DEL=\# 29 RM=rm -f 27 30 #MACFIX = install_name_tool -change 28 31 #MACCOPY = cp … … 37 40 #---------------------------------------------------------------------- 38 41 # Windows gfortran-32 39 COMPILER=--compiler=mingw3240 PACKCOPTS=--f77flags="-fno-range-check"41 SUFFIX=pyd42 F2PY=f2py43 MOVE=copy44 DEL=del42 #COMPILER=--compiler=mingw32 43 #PACKCOPTS=--f77flags="-fno-range-check" 44 #SUFFIX=pyd 45 #F2PY=f2py 46 #MOVE=copy 47 #DEL=del 45 48 46 49 … … 118 121 # $(DEL) ?????.$(SUFFIX) 119 122 123 clean: 124 $(RM) $(LIBS) 120 125 121 126 # no longer in use
Note: See TracChangeset
for help on using the changeset viewer.