Skip to content

Commit 3069c35

Browse files
vincefnvincefn
committed
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
1 parent 9c00806 commit 3069c35

File tree

3 files changed

+115
-50
lines changed

3 files changed

+115
-50
lines changed

‎Fox/Fox.xcodeproj/project.pbxproj

Lines changed: 82 additions & 23 deletions
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 */
@@ -153,10 +153,10 @@
153153
BF69C4D9124F8C310035CF57 /* WXGridWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF69C4D0124F8C310035CF57 /* WXGridWindow.cpp */; };
154154
BF92D5CF259F2D50005FD5D7 /* Undo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BF92D5CE259F2D4F005FD5D7 /* Undo.cpp */; };
155155
BFCB29CD258F7484008A8CCB /* include.h in Headers */ = {isa = PBXBuildFile; fileRef = BFCB29CC258F7484008A8CCB /* include.h */; };
156-
BFE729E4243A6A6D00BABE40 /* libwx_osx_cocoau_gl-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.1.a */; };
157-
BFE729E5243A6A7000BABE40 /* libwx_osx_cocoau-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */; };
158-
BFE729E6243A6A7300BABE40 /* libwxjpeg-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */; };
159-
BFE729E7243A6A7600BABE40 /* libwxpng-3.1.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFF7D0C21478047800799F7A /* libwxpng-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 */; };
@@ -359,10 +359,10 @@
359359
BF92D5CE259F2D4F005FD5D7 /* Undo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Undo.cpp; path = ../ObjCryst/ObjCryst/Undo.cpp; sourceTree = "<group>"; };
360360
BFCB29CC258F7484008A8CCB /* include.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = include.h; path = ../newmat/include.h; sourceTree = "<group>"; };
361361
BFE6AC680B886ACA007AFBA8 /* Indexing.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Indexing.cpp; path = ../ObjCryst/ObjCryst/Indexing.cpp; sourceTree = SOURCE_ROOT; };
362-
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>"; };
363-
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>"; };
364-
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>"; };
365-
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>"; };
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>"; };
@@ -1948,18 +1948,18 @@
19481948
BF1DE1130D228E6100A3939D /* AGL.framework in Frameworks */,
19491949
BF5EBF13283F8CB2000D09FE /* QuartzCore.framework in Frameworks */,
19501950
BF1DE1140D228E6100A3939D /* Carbon.framework 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;
@@ -2273,10 +2273,10 @@
22732273
BFFCCB4F089028D300044EBA = {
22742274
isa = PBXGroup;
22752275
children = (
2276-
BFF7D0BF1478047800799F7A /* libwx_osx_cocoau_gl-3.1.a */,
2277-
BFF7D0C01478047800799F7A /* libwx_osx_cocoau-3.1.a */,
2278-
BFF7D0C11478047800799F7A /* libwxjpeg-3.1.a */,
2279-
BFF7D0C21478047800799F7A /* libwxpng-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
};

‎Fox/macosx.mak

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ endif
2222
../newmat: ../newmat.tar.bz2
2323
cd .. && tar -xjf newmat.tar.bz2
2424

25-
../fftw-3.3.4.tar.gz:
26-
cd .. && curl -O http://fftw.org/fftw-3.3.4.tar.gz
25+
../fftw-3.3.10.tar.gz:
26+
cd .. && curl -O http://fftw.org/fftw-3.3.10.tar.gz
2727

28-
../static-libs/lib/libfftw3f.a: ../fftw-3.3.4.tar.gz
28+
../static-libs/lib/libfftw3f.a: ../fftw-3.3.10.tar.gz
2929
rm -f $(PWD)/../static-libs/lib/*fftw*
30-
cd .. && tar -xzf fftw-3.3.4.tar.gz && mv fftw-3.3.4 fftw
31-
cd ../fftw && MACOSX_DEPLOYMENT_TARGET=10.5 ./configure --enable-single --prefix $(PWD)/../static-libs && MACOSX_DEPLOYMENT_TARGET=10.5 make clean && MACOSX_DEPLOYMENT_TARGET=10.5 make -j4 install
30+
cd .. && tar -xzf fftw-3.3.10.tar.gz && mv fftw-3.3.10 fftw
31+
cd ../fftw && MACOSX_DEPLOYMENT_TARGET=11.0 ./configure --enable-single --prefix $(PWD)/../static-libs CFLAGS="-arch arm64 -arch x86_64 -mmacosx-version-min=11.0" && MACOSX_DEPLOYMENT_TARGET=11.0 make clean && MACOSX_DEPLOYMENT_TARGET=11.0 make -j4 install
3232
rm -Rf ../fftw
3333

3434
libfftw: ../static-libs/lib/libfftw3f.a
3535

3636

37-
../wxWidgets-3.1.6.tar.bz2:
38-
cd .. && $(DOWNLOAD_COMMAND) https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.6/wxWidgets-3.1.6.tar.bz2
37+
../wxWidgets-3.2.1.tar.bz2:
38+
cd .. && $(DOWNLOAD_COMMAND) https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxWidgets-3.2.1.tar.bz2
3939

40-
../static-libs/bin/wx-config: ../wxWidgets-3.1.6.tar.bz2
41-
cd .. && tar -xjf wxWidgets-3.1.6.tar.bz2
42-
cd ../wxWidgets-3.1.6 && ./configure --with-opengl --disable-debug --disable-webviewwebkit --enable-optimise --disable-shared --enable-monolithic --disable-mediactrl --without-libtiff --enable-cxx11 --prefix=$(PWD)/../static-libs && make -j4 install
43-
rm -Rf ../wxWidgets-3.1.6
40+
../static-libs/bin/wx-config: ../wxWidgets-3.2.1.tar.bz2
41+
cd .. && tar -xjf wxWidgets-3.2.1.tar.bz2
42+
cd ../wxWidgets-3.2.1 && MACOSX_DEPLOYMENT_TARGET=11.0 ./configure --with-opengl --disable-debug --disable-webviewwebkit --enable-optimise --disable-shared --enable-monolithic --disable-mediactrl --without-libtiff --enable-cxx11 --enable-universal_binary=x86_64,arm64 --prefix=$(PWD)/../static-libs && make -j4 install
43+
rm -Rf ../wxWidgets-3.2.1
4444

4545
libwx: ../static-libs/bin/wx-config
4646

@@ -61,6 +61,9 @@ dist:Fox
6161

6262
all: Fox Fox-nogui
6363

64+
tidy:
65+
make -f gnu.mak tidy
66+
6467
clean:
6568
rm -Rf build/Fox.build
6669
make -f gnu.mak clean

‎ObjCryst/rules-gnu.mak

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,13 @@ FFTW_LIB :=
117117
FFTW_FLAGS :=
118118
endif
119119

120-
ifneq ($(sse),0)
121-
SSE_FLAGS = -DHAVE_SSE_MATHFUN -DUSE_SSE2 -march=native
122-
else
120+
# Using SSE ? Automatically deactivate on ARM64
121+
UNAME_S := $(shell uname -m)
123122
SSE_FLAGS =
123+
ifneq ($(sse),0)
124+
ifneq ($(UNAME_S),arm64)
125+
SSE_FLAGS = -DHAVE_SSE_MATHFUN -DUSE_SSE2 -march=native $(UNAME_S)
126+
endif
124127
endif
125128

126129
ifneq ($(shared-newmat),1)
@@ -205,17 +208,17 @@ else
205208
libfreeglut=
206209
endif
207210

208-
$(BUILD_DIR)/wxWidgets-3.1.6.tar.bz2:
209-
cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.6/wxWidgets-3.1.6.tar.bz2
211+
$(BUILD_DIR)/wxWidgets-3.2.1.tar.bz2:
212+
cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxWidgets-3.2.1.tar.bz2
210213

211-
$(BUILD_DIR)/static-libs/include/wx-3.1/wx/wx.h: $(BUILD_DIR)/wxWidgets-3.1.6.tar.bz2
212-
cd $(BUILD_DIR) && rm -Rf wxWidgets-3.1.6 && tar -xjf wxWidgets-3.1.6.tar.bz2
213-
cd $(BUILD_DIR)/wxWidgets-3.1.6 && ./configure --with-gtk --with-opengl --disable-glcanvasegl --prefix=$(BUILD_DIR)/static-libs --enable-unicode --enable-optimise --disable-shared --x-includes=/usr/X11R6/include/ && $(MAKE) install
214-
rm -Rf $(BUILD_DIR)/wxWidgets-3.1.6
214+
$(BUILD_DIR)/static-libs/include/wx-3.2/wx/wx.h: $(BUILD_DIR)/wxWidgets-3.2.1.tar.bz2
215+
cd $(BUILD_DIR) && rm -Rf wxWidgets-3.2.1 && tar -xjf wxWidgets-3.2.1.tar.bz2
216+
cd $(BUILD_DIR)/wxWidgets-3.2.1 && ./configure --with-gtk --with-opengl --disable-glcanvasegl --prefix=$(BUILD_DIR)/static-libs --enable-unicode --enable-optimise --disable-shared --x-includes=/usr/X11R6/include/ && $(MAKE) install
217+
rm -Rf $(BUILD_DIR)/wxWidgets-3.2.1
215218

216219
ifneq ($(wxcryst),0)
217220
ifneq ($(shared-wxgtk),1)
218-
libwx = $(BUILD_DIR)/static-libs/include/wx-3.1/wx/wx.h
221+
libwx = $(BUILD_DIR)/static-libs/include/wx-3.2/wx/wx.h
219222
else
220223
libwx=
221224
endif
@@ -236,13 +239,13 @@ $(DIR_STATIC_LIBS)/lib/libcctbx.a: $(BUILD_DIR)/cctbx.tar.bz2
236239

237240
libcctbx: $(DIR_STATIC_LIBS)/lib/libcctbx.a
238241

239-
$(BUILD_DIR)/fftw-3.3.9.tar.gz:
240-
cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) http://fftw.org/fftw-3.3.9.tar.gz
242+
$(BUILD_DIR)/fftw-3.3.10.tar.gz:
243+
cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) http://fftw.org/fftw-3.3.10.tar.gz
241244

242-
$(DIR_STATIC_LIBS)/lib/libfftw3f.a: $(BUILD_DIR)/fftw-3.3.9.tar.gz
243-
cd $(BUILD_DIR) && tar -xzf fftw-3.3.9.tar.gz
244-
cd $(BUILD_DIR)/fftw-3.3.9 && ./configure --enable-single --prefix $(DIR_STATIC_LIBS) && $(MAKE) install
245-
rm -Rf $(BUILD_DIR)/fftw-3.3.9
245+
$(DIR_STATIC_LIBS)/lib/libfftw3f.a: $(BUILD_DIR)/fftw-3.3.10.tar.gz
246+
cd $(BUILD_DIR) && tar -xzf fftw-3.3.10.tar.gz
247+
cd $(BUILD_DIR)/fftw-3.3.10 && ./configure --enable-single --prefix $(DIR_STATIC_LIBS) && $(MAKE) install
248+
rm -Rf $(BUILD_DIR)/fftw-3.3.10
246249

247250
ifneq ($(fftw),0)
248251
ifneq ($(shared-fftw),1)

0 commit comments

Comments
 (0)