リビジョン | 617 (tree) |
---|---|
日時 | 2019-08-16 01:44:38 |
作者 | toshinagata1964 |
Updated for building in new system (still ongoing)
@@ -1,2 +0,0 @@ | ||
1 | -export TARGET_PLATFORM = MSW | |
2 | -include ../Makefile |
@@ -1,2 +0,0 @@ | ||
1 | -TARGET_PLATFORM = MAC | |
2 | -include ../Makefile |
@@ -1,34 +0,0 @@ | ||
1 | -<?xml version="1.0" encoding="UTF-8"?> | |
2 | -<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> | |
3 | -<plist version="0.9"> | |
4 | -<dict> | |
5 | - <key>CFBundleInfoDictionaryVersion</key> | |
6 | - <string>6.0</string> | |
7 | - <key>CFBundleIdentifier</key> | |
8 | - <string>com.yourcompany.Molby</string> | |
9 | - <key>CFBundleDevelopmentRegion</key> | |
10 | - <string>English</string> | |
11 | - <key>CFBundleExecutable</key> | |
12 | - <string>Molby</string> | |
13 | - <key>CFBundleName</key> | |
14 | - <string>Molby</string> | |
15 | - <key>CFBundlePackageType</key> | |
16 | - <string>APPL</string> | |
17 | - <key>CFBundleSignature</key> | |
18 | - <string>????</string> | |
19 | - <key>CFBundleVersion</key> | |
20 | - <string>0.0.0</string> | |
21 | - <key>CFBundleShortVersionString</key> | |
22 | - <string>0.0.0</string> | |
23 | - <key>CFBundleGetInfoString</key> | |
24 | - <string>Molby version 0.0.0, (c) 2008</string> | |
25 | - <key>CFBundleLongVersionString</key> | |
26 | - <string>0.0.0, (c) 2008</string> | |
27 | - <key>NSHumanReadableCopyright</key> | |
28 | - <string>Copyright 2008</string> | |
29 | - <key>LSRequiresCarbon</key> | |
30 | - <true/> | |
31 | - <key>CSResourcesFileMapped</key> | |
32 | - <true/> | |
33 | -</dict> | |
34 | -</plist> |
@@ -1,41 +0,0 @@ | ||
1 | -<?xml version="1.0" encoding="UTF-8"?> | |
2 | -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | |
3 | -<plist version="1.0"> | |
4 | -<dict> | |
5 | - <key>CFBundleDevelopmentRegion</key> | |
6 | - <string>English</string> | |
7 | - <key>CFBundleDocumentTypes</key> | |
8 | - <array> | |
9 | - <dict> | |
10 | - <key>CFBundleTypeExtensions</key> | |
11 | - <array> | |
12 | - <string>*</string> | |
13 | - </array> | |
14 | - <key>CFBundleTypeName</key> | |
15 | - <string>MyDocumentType</string> | |
16 | - <key>CFBundleTypeRole</key> | |
17 | - <string>Editor</string> | |
18 | - <key>LSTypeIsPackage</key> | |
19 | - <false/> | |
20 | - <key>NSPersistentStoreTypeKey</key> | |
21 | - <string>XML</string> | |
22 | - </dict> | |
23 | - </array> | |
24 | - <key>CFBundleExecutable</key> | |
25 | - <string>${EXECUTABLE_NAME}</string> | |
26 | - <key>CFBundleIconFile</key> | |
27 | - <string>molby_icon.icns</string> | |
28 | - <key>CFBundleIdentifier</key> | |
29 | - <string>com.yourcompany.Molby</string> | |
30 | - <key>CFBundleInfoDictionaryVersion</key> | |
31 | - <string>6.0</string> | |
32 | - <key>CFBundleName</key> | |
33 | - <string>${PRODUCT_NAME}</string> | |
34 | - <key>CFBundlePackageType</key> | |
35 | - <string>APPL</string> | |
36 | - <key>CFBundleSignature</key> | |
37 | - <string>????</string> | |
38 | - <key>CFBundleVersion</key> | |
39 | - <string>v0.6.5</string> | |
40 | -</dict> | |
41 | -</plist> |
@@ -1,7 +0,0 @@ | ||
1 | -TARGET_PLATFORM = MSW | |
2 | -CROSS_COMPILE = 1 | |
3 | -PWD = $(shell echo $$PWD) | |
4 | -ifeq ($(CONFIGURATION),Debug) | |
5 | - DEBUG = 1 | |
6 | -endif | |
7 | -include ../Makefile |
@@ -0,0 +1,5 @@ | ||
1 | +.* | |
2 | +memo.txt | |
3 | +revisionInfo.txt | |
4 | +latest_binaries | |
5 | + |
@@ -2153,7 +2153,7 @@ | ||
2153 | 2153 | { |
2154 | 2154 | float p[2]; |
2155 | 2155 | if (mview->isDragging == 0) { |
2156 | - if (abs(mousePos[0] - mview->dragStartPos[0]) >= 3 || abs(mousePos[1] - mview->dragStartPos[1]) >= 3) | |
2156 | + if (fabsf(mousePos[0] - mview->dragStartPos[0]) >= 3 || fabsf(mousePos[1] - mview->dragStartPos[1]) >= 3) | |
2157 | 2157 | mview->isDragging = 1; |
2158 | 2158 | else return; |
2159 | 2159 | } |
@@ -176,7 +176,7 @@ | ||
176 | 176 | arg.u.arval.nitems = nitems; |
177 | 177 | allocsize = itemsize * nitems + (arg.type == 's'); /* +1 for string type */ |
178 | 178 | if (allocsize == 0) |
179 | - arg.u.arval.ptr == NULL; | |
179 | + arg.u.arval.ptr = NULL; | |
180 | 180 | else { |
181 | 181 | arg.u.arval.ptr = calloc(1, allocsize); |
182 | 182 | if (arg.u.arval.ptr == NULL) |
@@ -6,8 +6,12 @@ | ||
6 | 6 | # (1) Location of the installation |
7 | 7 | |
8 | 8 | ifeq ($(TARGET_PLATFORM),MAC) |
9 | -ISYSROOT=-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch ppc -arch i386 | |
9 | +ISYSROOT=-isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -arch x86_64 | |
10 | 10 | endif |
11 | +ifeq ($(TARGET_PLATFORM),MSW) | |
12 | +CROSS_PREFIX=x86_64-w64-mingw32- | |
13 | +endif | |
14 | + | |
11 | 15 | BINDIR=$(AMBERHOME)/bin |
12 | 16 | LIBDIR=$(AMBERHOME)/lib |
13 | 17 | INCDIR=$(AMBERHOME)/include |
@@ -48,18 +52,23 @@ | ||
48 | 52 | # flex. |
49 | 53 | |
50 | 54 | ifeq ($(TARGET_PLATFORM),MAC) |
51 | -CC=gcc-4.0 $(ISYSROOT) | |
52 | -CXX=g++-4.0 $(ISYSROOT) | |
53 | -CPLUSPLUS=g++-4.0 $(ISYSROOT) | |
55 | +CC=gcc $(ISYSROOT) | |
56 | +CXX=g++ $(ISYSROOT) | |
57 | +CPLUSPLUS=g++ $(ISYSROOT) | |
54 | 58 | CFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DBINTRAJ $(AMBERBUILDFLAGS) |
55 | 59 | OCFLAGS=-O3 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DBINTRAJ $(AMBERBUILDFLAGS) |
56 | 60 | #NABFLAGS= |
57 | 61 | LDFLAGS= $(AMBERBUILDFLAGS) -framework Accelerate |
58 | -FLDFLAGS= -nodefaultlibs -lgfortran-static -lgcc -lc -lm -lSystem -lSystemStubs -lgfortranbegin | |
62 | +# Full path of the libquadmath.a | |
63 | +# Note: you also need to remove "-lquadmath" from libgfortran.spec, which resides | |
64 | +# in the same directory as libquadmath.a and other libraries. | |
65 | +LIBQUADMATH=/usr/local/gcc8/lib/libquadmath.a | |
66 | +#FLDFLAGS= -nodefaultlibs -lgfortran-static -lgcc -lc -lm -lSystem -lSystemStubs -lgfortranbegin | |
67 | +FLDFLAGS= -lgcc -lc -lm -lSystem -static-libgfortran -static-libgcc $(LIBQUADMATH) | |
59 | 68 | else |
60 | -CC=gcc | |
61 | -CXX=g++ | |
62 | -CPLUSPLUS=g++ | |
69 | +CC=$(CROSS_PREFIX)gcc | |
70 | +CXX=$(CROSS_PREFIX)g++ | |
71 | +CPLUSPLUS=$(CROSS_PREFIX)g++ | |
63 | 72 | CFLAGS= -DUSE_AMBER_C9XCOMPLEX -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $(AMBERBUILDFLAGS) -DWINDOWS=1 |
64 | 73 | OCFLAGS=-O3 -DUSE_AMBER_C9XCOMPLEX -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $(AMBERBUILDFLAGS) -DWINDOWS=1 |
65 | 74 | NABFLAGS= |
@@ -69,9 +78,9 @@ | ||
69 | 78 | |
70 | 79 | #LEX= flex |
71 | 80 | #YACC= $(BINDIR)/yacc |
72 | -AR= ar rv | |
81 | +AR= $(CROSS_PREFIX)ar rv | |
73 | 82 | M4= m4 |
74 | -RANLIB=ranlib | |
83 | +RANLIB=$(CROSS_PREFIX)ranlib | |
75 | 84 | MAKE=make |
76 | 85 | |
77 | 86 | # Set the C-preprocessor. Code for a small preprocessor is in |
@@ -115,14 +124,15 @@ | ||
115 | 124 | |
116 | 125 | ifeq ($(TARGET_PLATFORM),MAC) |
117 | 126 | FC=gfortran $(ISYSROOT) |
127 | +FPP=cpp -traditional -P -DNO_SANDER_DIVCON -DBINTRAJ | |
118 | 128 | else |
119 | -FC=gfortran | |
129 | +FC=$(CROSS_PREFIX)gfortran | |
130 | +FPP=cpp -traditional -P -DNO_SANDER_DIVCON -DBINTRAJ | |
120 | 131 | endif |
121 | 132 | FFLAGS= -O0 $(LOCALFLAGS) $(AMBERBUILDFLAGS) |
122 | 133 | FOPTFLAGS= -O3 $(LOCALFLAGS) $(AMBERBUILDFLAGS) |
123 | 134 | FREEFORMAT_FLAG= -ffree-form |
124 | 135 | LM=-lm |
125 | -FPP=cpp -traditional -P -DNO_SANDER_DIVCON -DBINTRAJ | |
126 | 136 | FPPFLAGS=-P -DNO_SANDER_DIVCON -DBINTRAJ |
127 | 137 | |
128 | 138 | BUILD_SLEAP=install_sleap |
@@ -1730,7 +1730,7 @@ | ||
1730 | 1730 | void |
1731 | 1731 | RubyDialogCallback_setFont(RDDeviceContext *dc, void **args) |
1732 | 1732 | { |
1733 | - int i, j; | |
1733 | + long i, j; | |
1734 | 1734 | wxDC *dcp = (wxDC *)dc; |
1735 | 1735 | if (dcp == NULL) |
1736 | 1736 | return; |
@@ -1740,7 +1740,7 @@ | ||
1740 | 1740 | float size = *((float *)(args[i + 1])); |
1741 | 1741 | font.SetPointSize((int)size); |
1742 | 1742 | } else if (strcmp((const char *)args[i], "style") == 0) { |
1743 | - int style = (int)(args[i + 1]); | |
1743 | + long style = (long)(args[i + 1]); | |
1744 | 1744 | switch (style) { |
1745 | 1745 | case 0: style = wxFONTSTYLE_NORMAL; break; |
1746 | 1746 | case 1: style = wxFONTSTYLE_ITALIC; break; |
@@ -1750,7 +1750,7 @@ | ||
1750 | 1750 | font.SetStyle(style); |
1751 | 1751 | } else if (strcmp((const char *)args[i], "family") == 0) { |
1752 | 1752 | wxFontFamily family; |
1753 | - j = (int)(args[i + 1]); | |
1753 | + j = (long)(args[i + 1]); | |
1754 | 1754 | switch (j) { |
1755 | 1755 | case 0: family = wxFONTFAMILY_DEFAULT; break; |
1756 | 1756 | case 1: family = wxFONTFAMILY_ROMAN; break; |
@@ -1761,7 +1761,7 @@ | ||
1761 | 1761 | font.SetFamily(family); |
1762 | 1762 | } else if (strcmp((const char *)args[i], "weight") == 0) { |
1763 | 1763 | wxFontWeight weight; |
1764 | - j = (int)(args[i + 1]); | |
1764 | + j = (long)(args[i + 1]); | |
1765 | 1765 | switch (j) { |
1766 | 1766 | case 0: weight = wxFONTWEIGHT_NORMAL; break; |
1767 | 1767 | case 1: weight = wxFONTWEIGHT_LIGHT; break; |
@@ -1793,7 +1793,7 @@ | ||
1793 | 1793 | float width = *((float *)(args[i + 1])); |
1794 | 1794 | pen.SetWidth((int)width); |
1795 | 1795 | } else if (strcmp((const char *)args[i], "style") == 0) { |
1796 | - int style = (int)(args[i + 1]); | |
1796 | + long style = (long)(args[i + 1]); | |
1797 | 1797 | switch (style) { |
1798 | 1798 | case 0: style = wxSOLID; break; |
1799 | 1799 | case 1: style = wxTRANSPARENT; break; |