• R/O
  • SSH
  • HTTPS

molby: Commit


Commit MetaInfo

Revision618 (tree)
Time2019-08-16 21:51:34
Authortoshinagata1964

Log Message

Xcode settings are restructured

Change Summary

Incremental Difference

--- trunk/Makefile (revision 617)
+++ trunk/Makefile (revision 618)
@@ -1,40 +1,31 @@
1-ifeq ($(TARGET_PLATFORM),MAC)
2- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
3- WX_LIB_DIR = $(WX_DIR)/osx-build/lib
4- WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/osx_cocoa-unicode-static-3.0
5- WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_FILE_OFFSET_BITS=64 -D__WXMAC__ -D__WXOSX__ -D__WXOSX_COCOA__
6- WX_LDFLAGS = -L$(WX_LIB_DIR) -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime -lwx_osx_cocoau-3.0 -lwx_osx_cocoau_gl-3.0 -framework WebKit -lwxregexu-3.0 -lwxtiff-3.0 -lwxjpeg-3.0 -lwxpng-3.0 -lz -lpthread -liconv
7- CPP_EXTRA_FLAGS = -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch ppc -arch i386 -DUSE_RUBY=1 -g -isystem $(PWD)/../../fftw-3.3.2/osx-build/include
8- LD_EXTRA_FLAGS = -framework Accelerate -framework GLUT -L$(PWD)/../../fftw-3.3.2/osx-build/lib -lfftw3
9- RUBY_DIR = $(PWD)/../../ruby-1.8.7-p160
10- RUBY_CFLAGS = -isystem $(RUBY_DIR)/osx-build/include
11- RUBY_LDFLAGS = -L$(RUBY_DIR)/osx-build/lib -lruby-static -lenc -ltrans
12- EXECUTABLE = Molby
13- EXE_SUFFIX =
14-endif
15-
161 ifeq ($(TARGET_PLATFORM),MSW)
17- ifneq ($(CROSS_COMPILE),)
2+ ifeq ($(TARGET_ARCH),x86_64)
3+ TOOL_PREFIX = x86_64-w64-mingw32-
4+ MSW_BUILD = build-win
5+ LIB_SUFFIX = -3.0-x86_64-w64-mingw32
6+ WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
7+ else
188 TOOL_PREFIX = i686-w64-mingw32-
19- CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
20- MSW_BUILD = mswx-build
9+# CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
10+ MSW_BUILD = build-win32
2111 LIB_SUFFIX = -3.0-i686-w64-mingw32
2212 WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
23- else
24- MSW_BUILD = msw-build
25- LIB_SUFFIX = -3.0
2613 endif
27- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
14+ WX_DIR = $(PWD)/../../wxWidgets-3.0.3
2815 WX_LIB_DIR = $(WX_DIR)/$(MSW_BUILD)/lib
2916 WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/$(TOOL_PREFIX)msw-unicode-static-3.0
3017 WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__
3118 WX_LDFLAGS = -L$(WX_LIB_DIR) -Wl,--subsystem,windows -mwindows -lwx_mswu_gl$(LIB_SUFFIX) -lopengl32 -lglu32 -lwx_mswu$(LIB_SUFFIX) -lwxregexu$(LIB_SUFFIX) -lwxexpat$(LIB_SUFFIX) -lwxtiff$(LIB_SUFFIX) -lwxjpeg$(LIB_SUFFIX) -lwxpng$(LIB_SUFFIX) -lwxzlib$(LIB_SUFFIX) -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
3219 CPP_EXTRA_FLAGS = -isystem $(PWD)/../../CLAPACK-3.1.1.1-mingw/INCLUDE -isystem $(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/include -I$(PWD)/../MolLib
33- LD_EXTRA_FLAGS = -L$(PWD)/../../CLAPACK-3.1.1.1-mingw/$(MSW_BUILD)/lib -L$(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/lib -llapackMinGW -lblasMinGW -lf2c_nomain -lfftw3 -static-libgcc -static-libstdc++
20+ LD_EXTRA_FLAGS = -L$(PWD)/../../CLAPACK-3.1.1.1-mingw/$(MSW_BUILD)/lib -L$(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/lib -llapackMinGW -lblasMinGW -lf2c_nomain -lfftw3 -static-libgcc -static-libstdc++ -Wl,-Bstatic,-lpthread
3421 RUBY_DIR = $(PWD)/../../ruby-2.0.0-p353
35- RUBY_CFLAGS = -isystem $(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0 -I$(RUBY_DIR) -I$(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0/i386-mingw32
36-# RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lmsvcrt-ruby200 -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
37- RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
22+ ifeq ($(TARGET_ARCH),x86_64)
23+ RUBY_CFLAGS = -isystem $(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0 -I$(RUBY_DIR) -I$(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0/x64-mingw32
24+ RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lx64-msvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
25+ else
26+ RUBY_CFLAGS = -isystem $(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0 -I$(RUBY_DIR) -I$(RUBY_DIR)/$(MSW_BUILD)/include/ruby-2.0.0/i386-mingw32
27+ RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
28+ endif
3829 EXECUTABLE = _Molby.exe_
3930 FINAL_EXECUTABLE = Molby.exe
4031 EXE_SUFFIX = .exe
@@ -70,8 +61,8 @@
7061 endif
7162 MAKEDIR = $(PWD)
7263 DESTDIR = $(PWD)/$(DESTPREFIX)
73-CFLAGS = $(CPPFLAGS) $(COPT) $(CPP_EXTRA_FLAGS) $(RUBY_CFLAGS) $(WX_CPPFLAGS)
74-LDFLAGS = $(WX_LDFLAGS) $(LD_EXTRA_FLAGS) $(RUBY_LDFLAGS)
64+CFLAGS = $(CPPFLAGS) $(COPT) $(RUBY_CFLAGS) $(WX_CPPFLAGS) $(CPP_EXTRA_FLAGS)
65+LDFLAGS = $(WX_LDFLAGS) $(RUBY_LDFLAGS) $(LD_EXTRA_FLAGS)
7566 export CFLAGS
7667 export LDFLAGS
7768 export DESTDIR
@@ -102,14 +93,16 @@
10293 # The following HOMETEMP kludges are to work around a bug where '#include "..."'
10394 # does not work when the include path is on the C: drive whereas the source is
10495 # on the Z: drive. 2009.7.24. Toshi Nagata
105-HOMETEMP = $(HOME)/__molby_temp_build__
96+# 2019.8.16. We no longer need this kludge
97+#HOMETEMP = $(HOME)/__molby_temp_build__
10698 $(DESTPREFIX)/$(RESOURCE) : molby.rc
107- mkdir -p $(HOMETEMP)/$(MSW_BUILD) $(HOMETEMP)/bitmaps
108- cp molby.rc $(HOMETEMP)/$(MSW_BUILD)
109- cp ../bitmaps/*.ico $(HOMETEMP)/bitmaps
110- (cd $(HOMETEMP)/$(MSW_BUILD); $(TOOL_PREFIX)windres -i molby.rc -o molby_rc.o -I$(WX_DIR)/include)
111- cp $(HOMETEMP)/$(MSW_BUILD)/molby_rc.o $@
112- rm -rf $(HOMETEMP)
99+ $(TOOL_PREFIX)windres -i molby.rc -o $(DESTPREFIX)/$(RESOURCE) -I$(WX_DIR)/include
100+# mkdir -p $(HOMETEMP)/$(MSW_BUILD) $(HOMETEMP)/bitmaps
101+# cp molby.rc $(HOMETEMP)/$(MSW_BUILD)
102+# cp ../bitmaps/*.ico $(HOMETEMP)/bitmaps
103+# (cd $(HOMETEMP)/$(MSW_BUILD); $(TOOL_PREFIX)windres -i molby.rc -o molby_rc.o -I$(WX_DIR)/include)
104+# cp $(HOMETEMP)/$(MSW_BUILD)/molby_rc.o $@
105+# rm -rf $(HOMETEMP)
113106 endif
114107
115108 depend: cleandep $(DESTPREFIX) $(OBJECTS:%.o=$(DESTPREFIX)/%.d) $(EXTRA_OBJECTS:%.o=$(DESTPREFIX)/%.d)
@@ -145,11 +138,8 @@
145138 ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
146139 DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
147140 $(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS) ../revisionInfo.txt
148-ifeq ($(TARGET_PLATFORM),MAC)
149- sh ../record_build_date.sh --with-svn-status
150-endif
151141 ifeq ($(TARGET_PLATFORM),MSW)
152- sh ../record_build_date.sh
142+ sh ../record_build_date.sh --with-svn-status >buildInfo.c
153143 endif
154144 $(CC) -c buildInfo.c -o $(DESTPREFIX)/buildInfo.o $(CFLAGS)
155145 $(CPP) -o $@ $(DESTOBJECTS) $(DESTPREFIX)/buildInfo.o $(CFLAGS) $(LDFLAGS)
@@ -173,7 +163,7 @@
173163 rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
174164 mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
175165 cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
176- cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
166+# cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
177167 cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
178168 cp -r amber11 $(DESTPREFIX)/$(PRODUCT_DIR)
179169 cp -r ortep3 $(DESTPREFIX)/$(PRODUCT_DIR)
@@ -186,7 +176,7 @@
186176
187177 setup: build/release/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
188178 mkdir -p ../latest_binaries
189-ifneq ($(CROSS_COMPILE),)
179+ifneq ($(WINE_PATH),)
190180 ($(WINE_PATH)/wine ../../Inno\ Setup\ 5/ISCC.exe molby.iss || exit 1)
191181 else
192182 (/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5/iscc molby.iss || exit 1)
--- trunk/build-win/Makefile (revision 617)
+++ trunk/build-win/Makefile (revision 618)
@@ -1,5 +1,6 @@
11 TARGET_PLATFORM = MSW
2-CROSS_COMPILE = 1
2+#CROSS_COMPILE = 1
3+TARGET_ARCH = x86_64
34 PWD = $(shell echo $$PWD)
45 ifeq ($(CONFIGURATION),Debug)
56 DEBUG = 1
--- trunk/build-xcode/.svnignore (revision 617)
+++ trunk/build-xcode/.svnignore (revision 618)
@@ -1,6 +1,6 @@
11 ortep3
22 amber11
33 build
4-buildInfo.*
4+buildInfo*
55 .*
66
--- trunk/build-xcode/Molby-Info.plist (revision 617)
+++ trunk/build-xcode/Molby-Info.plist (revision 618)
@@ -36,6 +36,6 @@
3636 <key>CFBundleSignature</key>
3737 <string>????</string>
3838 <key>CFBundleVersion</key>
39- <string>v0.6.5</string>
39+ <string>v1.0</string>
4040 </dict>
4141 </plist>
--- trunk/build-xcode/Molby.xcodeproj/.svnignore (revision 617)
+++ trunk/build-xcode/Molby.xcodeproj/.svnignore (revision 618)
@@ -2,3 +2,5 @@
22 *.mode1v3
33 *.pbxuser
44 project.xcworkspace
5+xcuserdata
6+
--- trunk/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist (revision 617)
+++ trunk/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist (revision 618)
@@ -4,26 +4,31 @@
44 <dict>
55 <key>SchemeUserState</key>
66 <dict>
7- <key>Molby.xcscheme</key>
7+ <key>Molby.xcscheme_^#shared#^_</key>
88 <dict>
99 <key>orderHint</key>
1010 <integer>0</integer>
1111 </dict>
12- <key>Molby_Archive.xcscheme</key>
12+ <key>Molby_Archive.xcscheme_^#shared#^_</key>
1313 <dict>
1414 <key>orderHint</key>
15- <integer>3</integer>
15+ <integer>2</integer>
1616 </dict>
17- <key>Molby_Windows.xcscheme</key>
17+ <key>Molby_command.xcscheme_^#shared#^_</key>
1818 <dict>
1919 <key>orderHint</key>
20- <integer>2</integer>
20+ <integer>1</integer>
2121 </dict>
22- <key>Molby_command.xcscheme</key>
22+ <key>Molby_win32.xcscheme_^#shared#^_</key>
2323 <dict>
2424 <key>orderHint</key>
25- <integer>1</integer>
25+ <integer>3</integer>
2626 </dict>
27+ <key>Molby_win64.xcscheme_^#shared#^_</key>
28+ <dict>
29+ <key>orderHint</key>
30+ <integer>4</integer>
31+ </dict>
2732 </dict>
2833 <key>SuppressBuildableAutocreation</key>
2934 <dict>
@@ -37,11 +42,6 @@
3742 <key>primary</key>
3843 <true/>
3944 </dict>
40- <key>E4CB370B1FE2C1F7001BB75E</key>
41- <dict>
42- <key>primary</key>
43- <true/>
44- </dict>
4545 <key>E4CB370F1FE4FF0E001BB75E</key>
4646 <dict>
4747 <key>primary</key>
--- trunk/build-xcode/buildInfo.c (revision 617)
+++ trunk/build-xcode/buildInfo.c (revision 618)
@@ -1,2 +1,2 @@
1-char *gLastBuildString = "2019-08-16 01:27:22 JST";
2-int gRevisionNumber = 612;
1+volatile char *gLastBuildString = "2019-08-16 21:40:23 JST";
2+volatile int gRevisionNumber = 617;
--- trunk/build-xcode/buildInfo.txt (revision 617)
+++ trunk/build-xcode/buildInfo.txt (revision 618)
@@ -1 +1 @@
1-last_build = "2019-08-16 01:27:22 JST"
1+last_build = "2019-08-16 21:40:23 JST"
--- trunk/record_build_date.sh (revision 617)
+++ trunk/record_build_date.sh (revision 618)
@@ -1,8 +1,8 @@
11 #!/bin/sh
2-# Usage: sh ../record_build_date.sh [--with-svn-status]
2+# Usage: sh ../record_build_date.sh [--with-svn-status] > buildInfo.c
33 LAST_BUILD=`date '+%Y-%m-%d %H:%M:%S %Z'`
44 echo "last_build = \"$LAST_BUILD\"" > buildInfo.txt
5-echo "char *gLastBuildString = \"$LAST_BUILD\";" > buildInfo.c
5+echo "volatile char *gLastBuildString = \"$LAST_BUILD\";"
66 if [ "$1" = "--with-svn-status" ]; then
77 REVISION_INFO=`(cd ..; svn status -v . --depth=empty | awk '{print $1}')`
88 echo $REVISION_INFO > ../revisionInfo.txt
@@ -12,4 +12,4 @@
1212 REVISION_INFO=0
1313 fi
1414 fi
15-echo "int gRevisionNumber = $REVISION_INFO;" >> buildInfo.c
15+echo "volatile int gRevisionNumber = $REVISION_INFO;"
--- trunk/wxSources/RubyDialogFrame.cpp (revision 617)
+++ trunk/wxSources/RubyDialogFrame.cpp (revision 618)
@@ -1740,7 +1740,7 @@
17401740 float size = *((float *)(args[i + 1]));
17411741 font.SetPointSize((int)size);
17421742 } else if (strcmp((const char *)args[i], "style") == 0) {
1743- long style = (long)(args[i + 1]);
1743+ long style = (intptr_t)(args[i + 1]);
17441744 switch (style) {
17451745 case 0: style = wxFONTSTYLE_NORMAL; break;
17461746 case 1: style = wxFONTSTYLE_ITALIC; break;
@@ -1750,7 +1750,7 @@
17501750 font.SetStyle(style);
17511751 } else if (strcmp((const char *)args[i], "family") == 0) {
17521752 wxFontFamily family;
1753- j = (long)(args[i + 1]);
1753+ j = (intptr_t)(args[i + 1]);
17541754 switch (j) {
17551755 case 0: family = wxFONTFAMILY_DEFAULT; break;
17561756 case 1: family = wxFONTFAMILY_ROMAN; break;
@@ -1761,7 +1761,7 @@
17611761 font.SetFamily(family);
17621762 } else if (strcmp((const char *)args[i], "weight") == 0) {
17631763 wxFontWeight weight;
1764- j = (long)(args[i + 1]);
1764+ j = (intptr_t)(args[i + 1]);
17651765 switch (j) {
17661766 case 0: weight = wxFONTWEIGHT_NORMAL; break;
17671767 case 1: weight = wxFONTWEIGHT_LIGHT; break;
@@ -1793,7 +1793,7 @@
17931793 float width = *((float *)(args[i + 1]));
17941794 pen.SetWidth((int)width);
17951795 } else if (strcmp((const char *)args[i], "style") == 0) {
1796- long style = (long)(args[i + 1]);
1796+ long style = (intptr_t)(args[i + 1]);
17971797 switch (style) {
17981798 case 0: style = wxSOLID; break;
17991799 case 1: style = wxTRANSPARENT; break;
Show on old repository browser