Skip to content

Commit c45c6d7

Browse files
vincefnvincefn
committed
Merge branch 'master' of github.com:vincefn/objcryst into upstream-objcryst
* 'master' of github.com:vincefn/objcryst: Enable automatic re-generation of HKL's for a PowderPatternDiffraction when the spacegroup is changed, or when the lattice parameters change (the latter only outside of an optimisation). This is done by making all the HKL attributes mutable, and overloading the SetHKL and GenHKLFullSpace, GenHKLFullSpace2 with a protected const version, which should only be used for powder diffraction (and not single crystal data). This should address diffpy/pyobjcryst#32 Update makefile to wxwidgets 3.2 and fftw to 3.3.10 ; update macOS Xcode project to make a universal binary with X86_64 and ARM64 architectures RefinableObj: change list<> to std::list<> to avoid compiler ambiguity with boost list. PowderPatternDiffraction: add GetFhklObsSq() and HasFhklObsSq() Correct update check code for YYYYNNN format. disable glcanvasegl for wxWindgets compilation under linux to avoid linking errors (?) Update wiki2pdf.py for python 3 Update Fox version. Add fenske-hall z-matrix with hydrogens to cimetidine tutorial. Update macOS build config and makefile with wxwidgets 3.1.6. Remove obsolete makefiles. Update changelog and windows project files Use a valid XML output for a Molecule RigidGroup, writing atoms as Atom1, Atom2 etc... instead of repeating the Atom attribute. Fixes vincefn/objcryst#52. The saved files will not be backwards-compatible (readable but the list of atoms in the rigid group will not be read) Fix double loop in PowderPattern::PrepareIntegratedRfactor. Better GetFormula for Crystal and Molecule Crystal::XMLInput(): add a hook to re-use atomic scattering power when mDeleteSubObjInDestructor is False. This is useful when re-loading Crystal configurations using their xml descriptions repeatedly, notably in python. Add relative_length_tolerance and absolute_angle_tolerance_degree to SpaceGroupExplorer::Run() and RunAll() Correct precision for Crystal::GetFormula() Add access to the weight (g/mol) for ScatteringPowerAtom and Crystal Add access to the weight (g/mol) for ScatteringPowerAtom and Crystal CreateCrystalFromCIF: throw exception if no crystal structure is found Add int_ptr() function to enable unique identification of objects through their address - useful in python where the wrapped object has a different address
2 parents d9fed52 + d5ca14e commit c45c6d7

33 files changed

+804
-906
lines changed

Diff for: ‎ChangeLog.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
#### 2020.1 (January 2021)
1+
#### 2022.1 (May 2022)
22
NEW FEATURES
33
* Add cylindrical absorption correction (mu*R)
44
* Access to Crystallography Open Database now uses an http access without
55
need for MySQL, and should work through firewalls
6+
* Added more internal functions for the pyobjcryst Python interface.
7+
See https://pyobjcryst.readthedocs.io/en/latest/examples/index.html
68

79
IMPROVEMENTS
10+
* Improve indexing: use the integrated goodness-of-fit based on P1 integration
11+
intervals as a default indicator, normalised by the number of reflections
12+
used (* nb_refl / nb_refl_P1)
813
* Switched to wxWidgets 3.1
914
* When using --cif2pattern, do not convert atoms to a Molecule (faster)
1015
* Fox grid allows a working directory with spaces in the path.
16+
* In the XML output, the atom list inside a RigidGroup will now be
17+
valid XML. NB: older Fox versions will not be able to read correctly
18+
the list of atoms inside the group.
1119

1220
BUG FIXES
1321
* Correct EstimateCellVolume estimation for orthorombic F
22+
* Correct calculation of integrated figures of merit (Rwp, etc..)
23+
with multiple crystalline phases (https://github.com/vincefn/objcryst/pull/53)
1424
* + several minor issues
1525

1626
#### 2017.2 (28 June 2017)

Diff for: ‎Fox/Fox.xcodeproj/project.pbxproj

+86-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -142,6 +142,7 @@
142142
BF3EB05508968F5500E02367 /* uctbx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF3EB05408968F5500E02367 /* uctbx.cpp */; };
143143
BF3EB063089690D200E02367 /* spoil_optimization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF3EB062089690D200E02367 /* spoil_optimization.cpp */; };
144144
BF49CDF01B0BC56E0012BF3B /* covalent_radii.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF49CDEF1B0BC56E0012BF3B /* covalent_radii.cpp */; };
145+
BF5EBF13283F8CB2000D09FE /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */; };
145146
BF69C4D1124F8C310035CF57 /* FoxClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4C8124F8C310035CF57 /* FoxClient.cpp */; };
146147
BF69C4D2124F8C310035CF57 /* FoxJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4C9124F8C310035CF57 /* FoxJob.cpp */; };
147148
BF69C4D3124F8C310035CF57 /* FoxServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4CA124F8C310035CF57 /* FoxServer.cpp */; };
@@ -152,11 +153,10 @@
152153
BF69C4D9124F8C310035CF57 /* WXGridWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4D0124F8C310035CF57 /* WXGridWindow.cpp */; };
153154
BF92D5CF259F2D50005FD5D7 /* Undo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF92D5CE259F2D4F005FD5D7 /* Undo.cpp */; };
154155
BFCB29CD258F7484008A8CCB /* include.h in Headers */ = {isa = PBXBuildFile; fileRef = BFCB29CC258F7484008A8CCB /* include.h */; };
155-
BFE729E4243A6A6D00BABE40 /* libwx_osx_cocoau_gl-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.1.a */; };
156-
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */; };
157-
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */; };
158-
BFE729E7243A6A7600BABE40 /* libwxpng-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C21478047800799F7A /* libwxpng-3.1.a */; };
159-
BFE729E8243A6A7900BABE40 /* libwxregexu-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */; };
156+
BFE729E4243A6A6D00BABE40 /* libwx_osx_cocoau_gl-3.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.2.a */; };
157+
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.2.a */; };
158+
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C11478047800799F7A /* libwxjpeg-3.2.a */; };
159+
BFE729E7243A6A7600BABE40 /* libwxpng-3.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C21478047800799F7A /* libwxpng-3.2.a */; };
160160
BFFB474E0E5E0E620027591E /* wxLSQ.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFB474D0E5E0E620027591E /* wxLSQ.cpp */; };
161161
BFFCCB670890296D00044EBA /* bandmat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFCCB660890296D00044EBA /* bandmat.cpp */; };
162162
BFFCCBA0089029F400044EBA /* cholesky.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BFFCCB6A089029F400044EBA /* cholesky.cpp */; };
@@ -346,6 +346,7 @@
346346
BF3EB05408968F5500E02367 /* uctbx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = uctbx.cpp; path = ../cctbx/cctbx/uctbx/uctbx.cpp; sourceTree = "<group>"; };
347347
BF3EB062089690D200E02367 /* spoil_optimization.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = spoil_optimization.cpp; path = ../cctbx/cctbx/uctbx/spoil_optimization.cpp; sourceTree = "<group>"; };
348348
BF49CDEF1B0BC56E0012BF3B /* covalent_radii.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = covalent_radii.cpp; path = ../cctbx/cctbx/eltbx/covalent_radii.cpp; sourceTree = "<group>"; };
349+
BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
349350
BF69C4C8124F8C310035CF57 /* FoxClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxClient.cpp; path = src/FoxClient.cpp; sourceTree = "<group>"; };
350351
BF69C4C9124F8C310035CF57 /* FoxJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxJob.cpp; path = src/FoxJob.cpp; sourceTree = "<group>"; };
351352
BF69C4CA124F8C310035CF57 /* FoxServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FoxServer.cpp; path = src/FoxServer.cpp; sourceTree = "<group>"; };
@@ -358,11 +359,10 @@
358359
BF92D5CE259F2D4F005FD5D7 /* Undo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Undo.cpp; path = ../ObjCryst/ObjCryst/Undo.cpp; sourceTree = "<group>"; };
359360
BFCB29CC258F7484008A8CCB /* include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = include.h; path = ../newmat/include.h; sourceTree = "<group>"; };
360361
BFE6AC680B886ACA007AFBA8 /* Indexing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Indexing.cpp; path = ../ObjCryst/ObjCryst/Indexing.cpp; sourceTree = SOURCE_ROOT; };
361-
BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_osx_cocoau_gl-3.1.a"; path = "../static-libs/lib/libwx_osx_cocoau_gl-3.1.a"; sourceTree = "<group>"; };
362-
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_osx_cocoau-3.1.a"; path = "../static-libs/lib/libwx_osx_cocoau-3.1.a"; sourceTree = "<group>"; };
363-
BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxjpeg-3.1.a"; path = "../static-libs/lib/libwxjpeg-3.1.a"; sourceTree = "<group>"; };
364-
BFF7D0C21478047800799F7A /* libwxpng-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxpng-3.1.a"; path = "../static-libs/lib/libwxpng-3.1.a"; sourceTree = "<group>"; };
365-
BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxregexu-3.1.a"; path = "../static-libs/lib/libwxregexu-3.1.a"; sourceTree = "<group>"; };
362+
BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_osx_cocoau_gl-3.2.a"; path = "../static-libs/lib/libwx_osx_cocoau_gl-3.2.a"; sourceTree = "<group>"; };
363+
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_osx_cocoau-3.2.a"; path = "../static-libs/lib/libwx_osx_cocoau-3.2.a"; sourceTree = "<group>"; };
364+
BFF7D0C11478047800799F7A /* libwxjpeg-3.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxjpeg-3.2.a"; path = "../static-libs/lib/libwxjpeg-3.2.a"; sourceTree = "<group>"; };
365+
BFF7D0C21478047800799F7A /* libwxpng-3.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxpng-3.2.a"; path = "../static-libs/lib/libwxpng-3.2.a"; sourceTree = "<group>"; };
366366
BFFB474D0E5E0E620027591E /* wxLSQ.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = wxLSQ.cpp; path = ../ObjCryst/wxCryst/wxLSQ.cpp; sourceTree = SOURCE_ROOT; };
367367
BFFCCB5D089028E500044EBA /* libnewmat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnewmat.a; sourceTree = BUILT_PRODUCTS_DIR; };
368368
BFFCCB660890296D00044EBA /* bandmat.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = bandmat.cpp; path = ../newmat/bandmat.cpp; sourceTree = "<group>"; };
@@ -1946,20 +1946,20 @@
19461946
buildActionMask = 2147483647;
19471947
files = (
19481948
BF1DE1130D228E6100A3939D /* AGL.framework in Frameworks */,
1949+
BF5EBF13283F8CB2000D09FE /* QuartzCore.framework in Frameworks */,
19491950
BF1DE1140D228E6100A3939D /* Carbon.framework in Frameworks */,
1950-
BFE729E8243A6A7900BABE40 /* libwxregexu-3.1.a in Frameworks */,
1951-
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.1.a in Frameworks */,
1951+
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.2.a in Frameworks */,
19521952
BF1DE1150D228E6100A3939D /* System.framework in Frameworks */,
19531953
BF1DE1160D228E6100A3939D /* IOKit.framework in Frameworks */,
1954-
BFE729E7243A6A7600BABE40 /* libwxpng-3.1.a in Frameworks */,
1954+
BFE729E7243A6A7600BABE40 /* libwxpng-3.2.a in Frameworks */,
19551955
BF1DE1170D228E6100A3939D /* OpenGL.framework in Frameworks */,
19561956
BF1DE1180D228E6100A3939D /* AppKit.framework in Frameworks */,
19571957
BF1DE1190D228E6100A3939D /* GLUT.framework in Frameworks */,
19581958
BF1DE11A0D228E6100A3939D /* WebKit.framework in Frameworks */,
19591959
BF1DE1110D228E5D00A3939D /* libcctbx.a in Frameworks */,
19601960
BF1DE1120D228E5D00A3939D /* libnewmat.a in Frameworks */,
1961-
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.1.a in Frameworks */,
1962-
BFE729E4243A6A6D00BABE40 /* libwx_osx_cocoau_gl-3.1.a in Frameworks */,
1961+
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.2.a in Frameworks */,
1962+
BFE729E4243A6A6D00BABE40 /* libwx_osx_cocoau_gl-3.2.a in Frameworks */,
19631963
BF1DE1240D228EA500A3939D /* libfftw3f.a in Frameworks */,
19641964
);
19651965
runOnlyForDeploymentPostprocessing = 0;
@@ -2265,18 +2265,18 @@
22652265
BF9466CB2205A0BB0086B9DC /* Frameworks */ = {
22662266
isa = PBXGroup;
22672267
children = (
2268+
BF5EBF12283F8CB2000D09FE /* QuartzCore.framework */,
22682269
);
22692270
name = Frameworks;
22702271
sourceTree = "<group>";
22712272
};
22722273
BFFCCB4F089028D300044EBA = {
22732274
isa = PBXGroup;
22742275
children = (
2275-
BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.1.a */,
2276-
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */,
2277-
BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */,
2278-
BFF7D0C21478047800799F7A /* libwxpng-3.1.a */,
2279-
BFF7D0C31478047800799F7A /* libwxregexu-3.1.a */,
2276+
BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.2.a */,
2277+
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.2.a */,
2278+
BFF7D0C11478047800799F7A /* libwxjpeg-3.2.a */,
2279+
BFF7D0C21478047800799F7A /* libwxpng-3.2.a */,
22802280
BF1DE1230D228EA500A3939D /* libfftw3f.a */,
22812281
BF36112F0BD6E409000C0EE9 /* WebKit.framework */,
22822282
BF36112B0BD6E3F5000C0EE9 /* GLUT.framework */,
@@ -4591,13 +4591,15 @@
45914591
BFFCCB51089028D300044EBA /* Project object */ = {
45924592
isa = PBXProject;
45934593
attributes = {
4594+
BuildIndependentTargetsInParallel = YES;
45944595
LastUpgradeCheck = 0710;
45954596
};
45964597
buildConfigurationList = BFFCCB52089028D300044EBA /* Build configuration list for PBXProject "Fox" */;
45974598
compatibilityVersion = "Xcode 3.2";
45984599
developmentRegion = English;
45994600
hasScannedForEncodings = 0;
46004601
knownRegions = (
4602+
English,
46014603
en,
46024604
);
46034605
mainGroup = BFFCCB4F089028D300044EBA;
@@ -4836,11 +4838,11 @@
48364838
GCC_VERSION = "";
48374839
HEADER_SEARCH_PATHS = (
48384840
"$(SRCROOT)/../static-libs/include",
4839-
"$(SRCROOT)/../static-libs/include/wx-3.1",
4840-
"$(SRCROOT)/../static-libs/lib/wx/include/osx_cocoa-unicode-static-3.1",
4841+
"$(SRCROOT)/../static-libs/include/wx-3.2",
48414842
"$(SRCROOT)/../ObjCryst",
48424843
"$(SRCROOT)/../cctbx/include",
48434844
"$(SRCROOT)/../",
4845+
"$(SRCROOT)/../static-libs/lib/wx/include/osx_cocoa-unicode-static-3.2",
48444846
);
48454847
INFOPLIST_FILE = "Fox-Info.plist";
48464848
INSTALL_PATH = "$(HOME)/Applications";
@@ -4864,6 +4866,35 @@
48644866
"-D__FOX_COD__",
48654867
"-DwxDEBUG_LEVEL=0",
48664868
);
4869+
"OTHER_CFLAGS[arch=arm64]" = (
4870+
"-D_FILE_OFFSET_BITS=64",
4871+
"-D_LARGE_FILES",
4872+
"-D__WXMAC__",
4873+
"-DHAVE_FFTW",
4874+
"-D__WX__CRYST__",
4875+
"-DOBJCRYST_GL",
4876+
"-DHAVE_GLUT",
4877+
"-D__WXOSX__",
4878+
"-D__WXOSX_COCOA__",
4879+
"-D__FOX_COD__",
4880+
"-DwxDEBUG_LEVEL=0",
4881+
);
4882+
"OTHER_CFLAGS[arch=x86_64]" = (
4883+
"-DUSE_SSE2",
4884+
"-DHAVE_SSE_MATHFUN",
4885+
"-D_FILE_OFFSET_BITS=64",
4886+
"-D_LARGE_FILES",
4887+
"-D__WXMAC__",
4888+
"-DHAVE_FFTW",
4889+
"-D__WX__CRYST__",
4890+
"-DOBJCRYST_GL",
4891+
"-DHAVE_GLUT",
4892+
"-D__WXOSX__",
4893+
"-D__WXOSX_COCOA__",
4894+
"-D__FOX_COD__",
4895+
"-DwxDEBUG_LEVEL=0",
4896+
);
4897+
"OTHER_CPLUSPLUSFLAGS[arch=*]" = "$(OTHER_CFLAGS)";
48674898
OTHER_LDFLAGS = (
48684899
"-framework",
48694900
Foundation,
@@ -4901,7 +4932,7 @@
49014932
GCC_STRICT_ALIASING = NO;
49024933
"INSTALL_PATH[sdk=*]" = "";
49034934
MACOSX_DEPLOYMENT_TARGET = 10.10;
4904-
ONLY_ACTIVE_ARCH = YES;
4935+
ONLY_ACTIVE_ARCH = NO;
49054936
"OTHER_CPLUSPLUSFLAGS[arch=*]" = (
49064937
"$(OTHER_CFLAGS)",
49074938
"-D__DEBUG__",
@@ -5012,11 +5043,11 @@
50125043
HEADER_SEARCH_PATHS = (
50135044
"$(SRCROOT)/../",
50145045
"$(SRCROOT)/../static-libs/include",
5015-
"$(SRCROOT)/../static-libs/include/wx-3.1",
5016-
"$(SRCROOT)/../static-libs/lib/wx/include/osx_cocoa-unicode-static-3.1",
5046+
"$(SRCROOT)/../static-libs/include/wx-3.2",
50175047
"$(SRCROOT)/../ObjCryst",
50185048
"$(SRCROOT)/../cctbx/include",
50195049
"$(SRCROOT)/../cctbx/scitbx/include",
5050+
"$(SRCROOT)/../static-libs/lib/wx/include/osx_cocoa-unicode-static-3.2",
50205051
);
50215052
INFOPLIST_FILE = "Fox-Info.plist";
50225053
INSTALL_PATH = "$(HOME)/Applications";
@@ -5040,6 +5071,34 @@
50405071
"-D__FOX_COD__",
50415072
"-DwxDEBUG_LEVEL=0",
50425073
);
5074+
"OTHER_CFLAGS[arch=arm64]" = (
5075+
"-D_FILE_OFFSET_BITS=64",
5076+
"-D_LARGE_FILES",
5077+
"-D__WXMAC__",
5078+
"-DHAVE_FFTW",
5079+
"-D__WX__CRYST__",
5080+
"-DOBJCRYST_GL",
5081+
"-DHAVE_GLUT",
5082+
"-D__WXOSX__",
5083+
"-D__WXOSX_COCOA__",
5084+
"-D__FOX_COD__",
5085+
"-DwxDEBUG_LEVEL=0",
5086+
);
5087+
"OTHER_CFLAGS[arch=x86_64]" = (
5088+
"-DUSE_SSE2",
5089+
"-DHAVE_SSE_MATHFUN",
5090+
"-D_FILE_OFFSET_BITS=64",
5091+
"-D_LARGE_FILES",
5092+
"-D__WXMAC__",
5093+
"-DHAVE_FFTW",
5094+
"-D__WX__CRYST__",
5095+
"-DOBJCRYST_GL",
5096+
"-DHAVE_GLUT",
5097+
"-D__WXOSX__",
5098+
"-D__WXOSX_COCOA__",
5099+
"-D__FOX_COD__",
5100+
"-DwxDEBUG_LEVEL=0",
5101+
);
50435102
OTHER_LDFLAGS = (
50445103
"-framework",
50455104
Foundation,
@@ -5158,7 +5217,7 @@
51585217
GCC_OPTIMIZATION_LEVEL = 3;
51595218
GCC_STRICT_ALIASING = NO;
51605219
MACOSX_DEPLOYMENT_TARGET = 10.10;
5161-
ONLY_ACTIVE_ARCH = YES;
5220+
ONLY_ACTIVE_ARCH = NO;
51625221
OTHER_CFLAGS = "";
51635222
SKIP_INSTALL = YES;
51645223
};

Diff for: ‎Fox/Fox_vc12.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Win32 = Debug|Win32
19-
Release_XP_NoCOD|Win32 = Release_XP_NoCOD|Win32
19+
Release (profile-guided optim generate)|Win32 = Release (profile-guided optim generate)|Win32
2020
Release|Win32 = Release|Win32
2121
EndGlobalSection
2222
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2323
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Debug|Win32.ActiveCfg = Debug|Win32
2424
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Debug|Win32.Build.0 = Debug|Win32
25-
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
26-
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
25+
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
26+
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
2727
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release|Win32.ActiveCfg = Release|Win32
2828
{2775CD9F-FFF3-4373-A229-94DD4B6D7747}.Release|Win32.Build.0 = Release|Win32
2929
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Debug|Win32.ActiveCfg = Debug|Win32
3030
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Debug|Win32.Build.0 = Debug|Win32
31-
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
32-
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
31+
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
32+
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
3333
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release|Win32.ActiveCfg = Release|Win32
3434
{39353CCC-A61A-47C9-8C1F-30FA52D3A1A2}.Release|Win32.Build.0 = Release|Win32
3535
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Debug|Win32.ActiveCfg = Debug|Win32
3636
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Debug|Win32.Build.0 = Debug|Win32
37-
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release_XP_NoCOD|Win32.ActiveCfg = Release_XP_NoCOD|Win32
38-
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release_XP_NoCOD|Win32.Build.0 = Release_XP_NoCOD|Win32
37+
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release (profile-guided optim generate)|Win32.ActiveCfg = Release (profile-guided optim generate)|Win32
38+
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release (profile-guided optim generate)|Win32.Build.0 = Release (profile-guided optim generate)|Win32
3939
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release|Win32.ActiveCfg = Release|Win32
4040
{BA6FA16F-837D-4869-90B9-44ACCD4EC001}.Release|Win32.Build.0 = Release|Win32
4141
EndGlobalSection

0 commit comments

Comments
 (0)