OSDN > ソフトウェアを探す > 科学/工学 > 分子科学 > Molby - 分子モデリングソフトウェア > SCM > git > Molby > コミット

Molby - 分子モデリングソフトウェア
Fork

R/O
HTTP
SSH
HTTPS

Molby: コミット

Molecular Modeling Software

コミットメタ情報

リビジョン	79b8b969722bae65bab2d8423fb8ed7caf0f9438 (tree)
日時	2019-08-16 21:51:34
作者	toshinagata1964 <toshinagata1964@a2be...>
コミッター	toshinagata1964

ログメッセージ

Xcode settings are restructured

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@618 a2be9bc6-48de-4e38-9406-05402d4bc13c

変更サマリ

modified: Makefile (diff)
modified: build-win/Makefile (diff)
modified: build-win/molby.iss (diff)
modified: build-xcode/.svnignore (diff)
modified: build-xcode/Molby-Info.plist (diff)
modified: build-xcode/Molby.xcodeproj/.svnignore (diff)
modified: build-xcode/Molby.xcodeproj/project.pbxproj (diff)
modified: build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate (diff)
delete: build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Windows.xcscheme
modified: build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist (diff)
delete: build-xcode/Molby.xcodeproj/{xcuserdata/toshi_n.xcuserdatad => xcshareddata}/xcschemes/Molby.xcscheme
delete: build-xcode/Molby.xcodeproj/{xcuserdata/toshi_n.xcuserdatad => xcshareddata}/xcschemes/Molby_Archive.xcscheme
delete: build-xcode/Molby.xcodeproj/{xcuserdata/toshi_n.xcuserdatad => xcshareddata}/xcschemes/Molby_command.xcscheme
modified: build-xcode/buildInfo.c (diff)
modified: build-xcode/buildInfo.txt (diff)
modified: record_build_date.sh (diff)
modified: wxSources/RubyDialogFrame.cpp (diff)

差分

--- a/Makefile

+++ b/Makefile

		@@ -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		-
16	1	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
18	8	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
21	11	LIB_SUFFIX = -3.0-i686-w64-mingw32
22	12	WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
23		- else
24		- MSW_BUILD = msw-build
25		- LIB_SUFFIX = -3.0
26	13	endif
27		- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
	14	+ WX_DIR = $(PWD)/../../wxWidgets-3.0.3
28	15	WX_LIB_DIR = $(WX_DIR)/$(MSW_BUILD)/lib
29	16	WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/$(TOOL_PREFIX)msw-unicode-static-3.0
30	17	WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__
31	18	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
32	19	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
34	21	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
38	29	EXECUTABLE = _Molby.exe_
39	30	FINAL_EXECUTABLE = Molby.exe
40	31	EXE_SUFFIX = .exe

		@@ -70,8 +61,8 @@ else
70	61	endif
71	62	MAKEDIR = $(PWD)
72	63	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)
75	66	export CFLAGS
76	67	export LDFLAGS
77	68	export DESTDIR

		@@ -102,14 +93,16 @@ RESOURCE = molby_rc.o
102	93	# The following HOMETEMP kludges are to work around a bug where '#include "..."'
103	94	# does not work when the include path is on the C: drive whereas the source is
104	95	# 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__
106	98	$(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)
113	106	endif
114	107
115	108	depend: cleandep $(DESTPREFIX) $(OBJECTS:%.o=$(DESTPREFIX)/%.d) $(EXTRA_OBJECTS:%.o=$(DESTPREFIX)/%.d)

		@@ -145,11 +138,8 @@ $(DESTPREFIX)/Ruby_bind.a : ../MolLib/Ruby_bind/*.[ch]
145	138	ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
146	139	DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
147	140	$(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS) ../revisionInfo.txt
148		-ifeq ($(TARGET_PLATFORM),MAC)
149		- sh ../record_build_date.sh --with-svn-status
150		-endif
151	141	ifeq ($(TARGET_PLATFORM),MSW)
152		- sh ../record_build_date.sh
	142	+ sh ../record_build_date.sh --with-svn-status >buildInfo.c
153	143	endif
154	144	$(CC) -c buildInfo.c -o $(DESTPREFIX)/buildInfo.o $(CFLAGS)
155	145	$(CPP) -o $@ $(DESTOBJECTS) $(DESTPREFIX)/buildInfo.o $(CFLAGS) $(LDFLAGS)

		@@ -173,7 +163,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
173	163	rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
174	164	mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
175	165	cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
176		- cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
	166	+# cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
177	167	cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
178	168	cp -r amber11 $(DESTPREFIX)/$(PRODUCT_DIR)
179	169	cp -r ortep3 $(DESTPREFIX)/$(PRODUCT_DIR)

		@@ -186,7 +176,7 @@ install: setup
186	176
187	177	setup: build/release/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
188	178	mkdir -p ../latest_binaries
189		-ifneq ($(CROSS_COMPILE),)
	179	+ifneq ($(WINE_PATH),)
190	180	($(WINE_PATH)/wine ../../Inno\ Setup\ 5/ISCC.exe molby.iss \|\| exit 1)
191	181	else
192	182	(/c/Program\ Files\ $x86$/Inno\ Setup\ 5/iscc molby.iss \|\| exit 1)

--- a/build-win/Makefile

+++ b/build-win/Makefile

		@@ -1,5 +1,6 @@
1	1	TARGET_PLATFORM = MSW
2		-CROSS_COMPILE = 1
	2	+#CROSS_COMPILE = 1
	3	+TARGET_ARCH = x86_64
3	4	PWD = $(shell echo $$PWD)
4	5	ifeq ($(CONFIGURATION),Debug)
5	6	DEBUG = 1

--- a/build-win/molby.iss

+++ b/build-win/molby.iss

		@@ -1,6 +1,6 @@
1	1	[Setup]
2	2	AppName = Molby
3		-AppVerName = Molby (v1.0b3)
	3	+AppVerName = Molby (v1.0)
4	4	DefaultDirName = {pf}\Molby
5	5	DefaultGroupName = Molby
6	6	UninstallDisplayIcon = {app}\Molby.exe

		@@ -8,7 +8,6 @@ OutputBaseFileName = SetupMolbyWin
8	8
9	9	[Files]
10	10	Source: "build\release\Molby\Molby.exe"; DestDir: {app}
11		-Source: "build\release\Molby\mingwm10.dll"; DestDir: {app}
12	11	Source: "build\release\Molby\amber11\bin\*"; DestDir: {app}\amber11\bin
13	12	Source: "build\release\Molby\amber11\dat\antechamber\*"; DestDir: {app}\amber11\dat\antechamber
14	13	Source: "build\release\Molby\amber11\dat\leap\parm\*"; DestDir: {app}\amber11\dat\leap\parm

--- a/build-xcode/.svnignore

+++ b/build-xcode/.svnignore

		@@ -1,6 +1,6 @@
1	1	ortep3
2	2	amber11
3	3	build
4		-buildInfo.*
	4	+buildInfo*
5	5	.*
6	6

--- a/build-xcode/Molby-Info.plist

+++ b/build-xcode/Molby-Info.plist

		@@ -36,6 +36,6 @@
36	36	<key>CFBundleSignature</key>
37	37	<string>????</string>
38	38	<key>CFBundleVersion</key>
39		- <string>v0.6.5</string>
	39	+ <string>v1.0</string>
40	40	</dict>
41	41	</plist>

--- a/build-xcode/Molby.xcodeproj/.svnignore

+++ b/build-xcode/Molby.xcodeproj/.svnignore

		@@ -2,3 +2,5 @@
2	2	*.mode1v3
3	3	*.pbxuser
4	4	project.xcworkspace
	5	+xcuserdata
	6	+

--- a/build-xcode/Molby.xcodeproj/project.pbxproj

+++ b/build-xcode/Molby.xcodeproj/project.pbxproj

		@@ -7,9 +7,9 @@
7	7	objects = {
8	8
9	9	/* Begin PBXAggregateTarget section */
10		- E4CB370F1FE4FF0E001BB75E /* Molby (Mac Archive) */ = {
	10	+ E4CB370F1FE4FF0E001BB75E /* Molby_archive */ = {
11	11	isa = PBXAggregateTarget;
12		- buildConfigurationList = E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby (Mac Archive)" */;
	12	+ buildConfigurationList = E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby_archive" */;
13	13	buildPhases = (
14	14	E4CB37171FE4FF42001BB75E /* ShellScript */,
15	15	);

		@@ -17,8 +17,9 @@
17	17	E4CB37141FE4FF23001BB75E /* PBXTargetDependency */,
18	18	E4CB37161FE4FF23001BB75E /* PBXTargetDependency */,
19	19	E4CB37191FE50707001BB75E /* PBXTargetDependency */,
	20	+ E4B710FF2306BD0A000A77EB /* PBXTargetDependency */,
20	21	);
21		- name = "Molby (Mac Archive)";
	22	+ name = Molby_archive;
22	23	productName = "Molby (Mac Archive)";
23	24	};
24	25	/* End PBXAggregateTarget section */

		@@ -48,6 +49,7 @@
48	49	E420BE24188574F600A2B983 /* wxKillAddition.cpp in Sources / = {isa = PBXBuildFile; fileRef = E420BE21188574F600A2B983 / wxKillAddition.cpp */; };
49	50	E45B94621A170B9A008E95EB /* docview.cpp in Sources / = {isa = PBXBuildFile; fileRef = E45B94611A170B9A008E95EB / docview.cpp */; };
50	51	E4653CB118A0CC7D0022377B /* textctrl_addition.mm in Sources / = {isa = PBXBuildFile; fileRef = E4653CB018A0CC7D0022377B / textctrl_addition.mm */; };
	52	+ E49B3DF72306D9F500422E13 /* buildInfo_cmd.c in Sources / = {isa = PBXBuildFile; fileRef = E49B3DF62306D9F500422E13 / buildInfo_cmd.c */; };
51	53	E49BFBFA1886E72000188237 /* MyVersion.c in Sources / = {isa = PBXBuildFile; fileRef = E420BE18188574D700A2B983 / MyVersion.c */; };
52	54	E49BFBFB1886E74600188237 /* IntGroup.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC777D183E4F3F0064FB2E / IntGroup.c */; };
53	55	E49BFBFF1886E74600188237 /* MainViewCommon.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC7781183E4F3F0064FB2E / MainViewCommon.c */; };

		@@ -69,7 +71,6 @@
69	71	E49BFC191886E76F00188237 /* ruby_bind.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC779F183E4F3F0064FB2E / ruby_bind.c */; };
70	72	E49BFC1B1886E77000188237 /* ruby_md.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC77A2183E4F3F0064FB2E / ruby_md.c */; };
71	73	E49BFC1C1886E77100188237 /* ruby_types.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC77A3183E4F3F0064FB2E / ruby_types.c */; };
72		- E49BFC1F1886E78600188237 /* buildInfo.c in Sources / = {isa = PBXBuildFile; fileRef = E4FC7CA5183F94D30064FB2E / buildInfo.c */; };
73	74	E49BFC2C1886E88A00188237 /* Accelerate.framework in Frameworks / = {isa = PBXBuildFile; fileRef = E4FC7810183E50DC0064FB2E / Accelerate.framework */; };
74	75	E4ACACE718C6D32300F08B67 /* ortep3 in Resources / = {isa = PBXBuildFile; fileRef = E4ACACE418C6D32300F08B67 / ortep3 */; };
75	76	E4D379A219C87C2200636D28 /* modalwindow.cpp in Sources / = {isa = PBXBuildFile; fileRef = E4D379A119C87C2200636D28 / modalwindow.cpp */; };

		@@ -119,6 +120,13 @@
119	120	/* End PBXBuildFile section */
120	121
121	122	/* Begin PBXContainerItemProxy section */
	123	+ E4B710FE2306BD0A000A77EB /* PBXContainerItemProxy */ = {
	124	+ isa = PBXContainerItemProxy;
	125	+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
	126	+ proxyType = 1;
	127	+ remoteGlobalIDString = E4B710FA2306BC80000A77EB;
	128	+ remoteInfo = Molby_win64;
	129	+ };
122	130	E4CB37131FE4FF23001BB75E /* PBXContainerItemProxy */ = {
123	131	isa = PBXContainerItemProxy;
124	132	containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;

		@@ -202,6 +210,7 @@
202	210	E420BE21188574F600A2B983 /* wxKillAddition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wxKillAddition.cpp; sourceTree = "<group>"; };
203	211	E45B94611A170B9A008E95EB /* docview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = docview.cpp; sourceTree = "<group>"; };
204	212	E4653CB018A0CC7D0022377B /* textctrl_addition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = textctrl_addition.mm; sourceTree = "<group>"; };
	213	+ E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buildInfo_cmd.c; sourceTree = "<group>"; };
205	214	E49BFB761886E2E400188237 /* Molby_command */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Molby_command; sourceTree = BUILT_PRODUCTS_DIR; };
206	215	E4ACACE418C6D32300F08B67 /* ortep3 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ortep3; sourceTree = "<group>"; };
207	216	E4CB37081FDD4654001BB75E /* OpenGL_extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OpenGL_extensions.c; sourceTree = "<group>"; };

		@@ -344,6 +353,7 @@
344	353	E4FC7C28183E55820064FB2E /* wxSources */,
345	354	E4FC7779183E4F3F0064FB2E /* MolLib */,
346	355	E4FC7CA5183F94D30064FB2E /* buildInfo.c */,
	356	+ E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */,
347	357	);
348	358	name = Sources;
349	359	sourceTree = "<group>";

		@@ -526,17 +536,31 @@
526	536	/* End PBXGroup section */
527	537
528	538	/* Begin PBXLegacyTarget section */
529		- E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */ = {
	539	+ E4B710FA2306BC80000A77EB /* Molby_win64 */ = {
530	540	isa = PBXLegacyTarget;
531		- buildArgumentsString = "PATH=/usr/local/mingw-w32/bin:$PATH make $(ACTION)";
532		- buildConfigurationList = E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby (Windows)" */;
	541	+ buildArgumentsString = "PATH=/usr/local/homebrew/bin:$PATH make $(ACTION)";
	542	+ buildConfigurationList = E4B710FB2306BC80000A77EB /* Build configuration list for PBXLegacyTarget "Molby_win64" */;
533	543	buildPhases = (
534	544	);
535	545	buildToolPath = /usr/bin/env;
536	546	buildWorkingDirectory = "$(PROJECT_DIR)/../build-win";
537	547	dependencies = (
538	548	);
539		- name = "Molby (Windows)";
	549	+ name = Molby_win64;
	550	+ passBuildSettingsInEnvironment = 1;
	551	+ productName = "Molby (Windows)";
	552	+ };
	553	+ E4CB370B1FE2C1F7001BB75E /* Molby_win32 */ = {
	554	+ isa = PBXLegacyTarget;
	555	+ buildArgumentsString = "PATH=/usr/local/homebrew/bin:$PATH make $(ACTION)";
	556	+ buildConfigurationList = E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby_win32" */;
	557	+ buildPhases = (
	558	+ );
	559	+ buildToolPath = /usr/bin/env;
	560	+ buildWorkingDirectory = "$(PROJECT_DIR)/../build-win32";
	561	+ dependencies = (
	562	+ );
	563	+ name = Molby_win32;
540	564	passBuildSettingsInEnvironment = 1;
541	565	productName = "Molby (Windows)";
542	566	};

		@@ -567,6 +591,7 @@
567	591	isa = PBXNativeTarget;
568	592	buildConfigurationList = E49BFB7A1886E30200188237 /* Build configuration list for PBXNativeTarget "Molby_command" */;
569	593	buildPhases = (
	594	+ E49B3DF82306DB1800422E13 /* ShellScript */,
570	595	E49BFB731886E2E400188237 /* Sources */,
571	596	E49BFB741886E2E400188237 /* Frameworks */,
572	597	E4DF3BCD1FDCEAEE0014F980 /* CopyFiles */,

		@@ -614,8 +639,9 @@
614	639	targets = (
615	640	8D1107260486CEB800E47090 /* Molby */,
616	641	E49BFB751886E2E400188237 /* Molby_command */,
617		- E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */,
618		- E4CB370F1FE4FF0E001BB75E /* Molby (Mac Archive) */,
	642	+ E4CB370B1FE2C1F7001BB75E /* Molby_win32 */,
	643	+ E4B710FA2306BC80000A77EB /* Molby_win64 */,
	644	+ E4CB370F1FE4FF0E001BB75E /* Molby_archive */,
619	645	);
620	646	};
621	647	/* End PBXProject section */

		@@ -661,6 +687,23 @@
661	687	shellPath = /bin/sh;
662	688	shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n mkdir -p \"$PROJECT_DIR/../latest_binaries/Molby\" \|\| exit 1\n (cd \"$PROJECT_DIR/../latest_binaries/Molby\" && rm -rf Molby_command Molby_resources) \|\| exit 1\n (cd \"$TARGET_BUILD_DIR\"; cp -a Molby_command Molby_resources \"$PROJECT_DIR/../latest_binaries/Molby\") \|\| exit 1\nfi\n";
663	689	};
	690	+ E49B3DF82306DB1800422E13 /* ShellScript */ = {
	691	+ isa = PBXShellScriptBuildPhase;
	692	+ buildActionMask = 2147483647;
	693	+ files = (
	694	+ );
	695	+ inputFileListPaths = (
	696	+ );
	697	+ inputPaths = (
	698	+ );
	699	+ outputFileListPaths = (
	700	+ );
	701	+ outputPaths = (
	702	+ );
	703	+ runOnlyForDeploymentPostprocessing = 0;
	704	+ shellPath = /bin/sh;
	705	+ shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status >buildInfo_cmd.c\n";
	706	+ };
664	707	E4CB37171FE4FF42001BB75E /* ShellScript */ = {
665	708	isa = PBXShellScriptBuildPhase;
666	709	buildActionMask = 2147483647;

		@@ -672,7 +715,7 @@
672	715	);
673	716	runOnlyForDeploymentPostprocessing = 0;
674	717	shellPath = /bin/sh;
675		- shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n (cd \"$PROJECT_DIR/../latest_binaries\" && rm -f MolbyMac.zip && zip -r MolbyMac.zip Molby -x \\.DS_Store -x \\.svn) \|\| exit 1\n (cd \"$PROJECT_DIR/../Documents\" && /usr/bin/ruby makedoc.rb && cp -a MolbyDoc \"$PROJECT_DIR/../latest_binaries\") \|\| exit 1\n (cd \"$PROJECT_DIR/../latest_binaries\" && zip -r MolbyDoc.zip MolbyDoc -x \\.DS_Store -x \\.svn) \|\| exit 1\n (cd \"$PROJECT_DIR/../mswx-build\"; PATH=/usr/local/mingw-w32/bin:$PATH; make setup) \|\| exit 1\nfi\n";
	718	+ shellScript = "if [ \"${BUILD_STYLE:=$CONFIGURATION}\" = \"Release\" ]; then\n (cd \"$PROJECT_DIR/../latest_binaries\" && rm -f MolbyMac.zip && zip -r MolbyMac.zip Molby -x \\.DS_Store -x \\.svn) \|\| exit 1\n (cd \"$PROJECT_DIR/../Documents\" && /usr/bin/ruby makedoc.rb && cp -a MolbyDoc \"$PROJECT_DIR/../latest_binaries\") \|\| exit 1\n (cd \"$PROJECT_DIR/../latest_binaries\" && zip -r MolbyDoc.zip MolbyDoc -x \\.DS_Store -x \\.svn) \|\| exit 1\n (cd \"$PROJECT_DIR/../build-win32\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) \|\| exit 1\n (cd \"$PROJECT_DIR/../build-win\"; PATH=/usr/local/homebrew/bin:$PATH; make setup) \|\| exit 1\nfi\n";
676	719	};
677	720	E4FC7B57183E516E0064FB2E /* ShellScript */ = {
678	721	isa = PBXShellScriptBuildPhase;

		@@ -685,7 +728,7 @@
685	728	);
686	729	runOnlyForDeploymentPostprocessing = 0;
687	730	shellPath = /bin/sh;
688		- shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status\n";
	731	+ shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status >buildInfo.c\n";
689	732	};
690	733	/* End PBXShellScriptBuildPhase section */
691	734

		@@ -764,6 +807,7 @@
764	807	E49BFC111886E74600188237 /* cmdtool_stubs.c in Sources */,
765	808	E49BFC121886E75700188237 /* MDCore.c in Sources */,
766	809	E49BFC131886E75C00188237 /* MDEwald.c in Sources */,
	810	+ E49B3DF72306D9F500422E13 /* buildInfo_cmd.c in Sources */,
767	811	E49BFC141886E75D00188237 /* MDForce.c in Sources */,
768	812	E49BFC151886E75D00188237 /* MDGraphite.c in Sources */,
769	813	E49BFC161886E75E00188237 /* MDPressure.c in Sources */,

		@@ -771,13 +815,17 @@
771	815	E49BFC191886E76F00188237 /* ruby_bind.c in Sources */,
772	816	E49BFC1B1886E77000188237 /* ruby_md.c in Sources */,
773	817	E49BFC1C1886E77100188237 /* ruby_types.c in Sources */,
774		- E49BFC1F1886E78600188237 /* buildInfo.c in Sources */,
775	818	);
776	819	runOnlyForDeploymentPostprocessing = 0;
777	820	};
778	821	/* End PBXSourcesBuildPhase section */
779	822
780	823	/* Begin PBXTargetDependency section */
	824	+ E4B710FF2306BD0A000A77EB /* PBXTargetDependency */ = {
	825	+ isa = PBXTargetDependency;
	826	+ target = E4B710FA2306BC80000A77EB /* Molby_win64 */;
	827	+ targetProxy = E4B710FE2306BD0A000A77EB /* PBXContainerItemProxy */;
	828	+ };
781	829	E4CB37141FE4FF23001BB75E /* PBXTargetDependency */ = {
782	830	isa = PBXTargetDependency;
783	831	target = 8D1107260486CEB800E47090 /* Molby */;

		@@ -790,7 +838,7 @@
790	838	};
791	839	E4CB37191FE50707001BB75E /* PBXTargetDependency */ = {
792	840	isa = PBXTargetDependency;
793		- target = E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */;
	841	+ target = E4CB370B1FE2C1F7001BB75E /* Molby_win32 */;
794	842	targetProxy = E4CB37181FE50707001BB75E /* PBXContainerItemProxy */;
795	843	};
796	844	/* End PBXTargetDependency section */

		@@ -917,37 +965,31 @@
917	965	C01FCF4F08A954540054247B /* Debug */ = {
918	966	isa = XCBuildConfiguration;
919	967	buildSettings = {
920		- ARCHS = (
921		- ppc,
922		- i386,
923		- );
	968	+ ARCHS = "$(ARCHS_STANDARD)";
924	969	GCC_C_LANGUAGE_STANDARD = gnu99;
925	970	GCC_MODEL_TUNING = G5;
926	971	GCC_OPTIMIZATION_LEVEL = 0;
927	972	GCC_WARN_ABOUT_RETURN_TYPE = YES;
928	973	GCC_WARN_UNUSED_VARIABLE = YES;
929		- MACOSX_DEPLOYMENT_TARGET = 10.5;
	974	+ MACOSX_DEPLOYMENT_TARGET = 10.6;
930	975	ONLY_ACTIVE_ARCH = YES;
931	976	PREBINDING = NO;
932		- SDKROOT = macosx10.5;
	977	+ SDKROOT = macosx10.6;
933	978	};
934	979	name = Debug;
935	980	};
936	981	C01FCF5008A954540054247B /* Release */ = {
937	982	isa = XCBuildConfiguration;
938	983	buildSettings = {
939		- ARCHS = (
940		- ppc,
941		- i386,
942		- );
	984	+ ARCHS = "$(ARCHS_STANDARD)";
943	985	GCC_C_LANGUAGE_STANDARD = gnu99;
944	986	GCC_MODEL_TUNING = G5;
945	987	GCC_OPTIMIZATION_LEVEL = 2;
946	988	GCC_WARN_ABOUT_RETURN_TYPE = YES;
947	989	GCC_WARN_UNUSED_VARIABLE = YES;
948		- MACOSX_DEPLOYMENT_TARGET = 10.5;
	990	+ MACOSX_DEPLOYMENT_TARGET = 10.6;
949	991	PREBINDING = NO;
950		- SDKROOT = macosx10.5;
	992	+ SDKROOT = macosx10.6;
951	993	};
952	994	name = Release;
953	995	};

		@@ -1020,6 +1062,90 @@
1020	1062	};
1021	1063	name = Release;
1022	1064	};
	1065	+ E4B710FC2306BC80000A77EB /* Debug */ = {
	1066	+ isa = XCBuildConfiguration;
	1067	+ buildSettings = {
	1068	+ ALWAYS_SEARCH_USER_PATHS = NO;
	1069	+ CLANG_ANALYZER_NONNULL = YES;
	1070	+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
	1071	+ CLANG_CXX_LIBRARY = "libc++";
	1072	+ CLANG_ENABLE_MODULES = YES;
	1073	+ CLANG_ENABLE_OBJC_ARC = YES;
	1074	+ CLANG_WARN_BOOL_CONVERSION = YES;
	1075	+ CLANG_WARN_CONSTANT_CONVERSION = YES;
	1076	+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
	1077	+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
	1078	+ CLANG_WARN_EMPTY_BODY = YES;
	1079	+ CLANG_WARN_ENUM_CONVERSION = YES;
	1080	+ CLANG_WARN_INFINITE_RECURSION = YES;
	1081	+ CLANG_WARN_INT_CONVERSION = YES;
	1082	+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
	1083	+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
	1084	+ CLANG_WARN_UNREACHABLE_CODE = YES;
	1085	+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
	1086	+ COPY_PHASE_STRIP = NO;
	1087	+ DEBUGGING_SYMBOLS = YES;
	1088	+ DEBUG_INFORMATION_FORMAT = dwarf;
	1089	+ ENABLE_STRICT_OBJC_MSGSEND = YES;
	1090	+ ENABLE_TESTABILITY = YES;
	1091	+ GCC_DYNAMIC_NO_PIC = NO;
	1092	+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
	1093	+ GCC_NO_COMMON_BLOCKS = YES;
	1094	+ GCC_OPTIMIZATION_LEVEL = 0;
	1095	+ GCC_PREPROCESSOR_DEFINITIONS = (
	1096	+ "DEBUG=1",
	1097	+ "$(inherited)",
	1098	+ );
	1099	+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
	1100	+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
	1101	+ GCC_WARN_UNDECLARED_SELECTOR = YES;
	1102	+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
	1103	+ GCC_WARN_UNUSED_FUNCTION = YES;
	1104	+ MTL_ENABLE_DEBUG_INFO = YES;
	1105	+ OTHER_CFLAGS = "";
	1106	+ OTHER_LDFLAGS = "";
	1107	+ PRODUCT_NAME = "$(TARGET_NAME)";
	1108	+ };
	1109	+ name = Debug;
	1110	+ };
	1111	+ E4B710FD2306BC80000A77EB /* Release */ = {
	1112	+ isa = XCBuildConfiguration;
	1113	+ buildSettings = {
	1114	+ ALWAYS_SEARCH_USER_PATHS = NO;
	1115	+ CLANG_ANALYZER_NONNULL = YES;
	1116	+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
	1117	+ CLANG_CXX_LIBRARY = "libc++";
	1118	+ CLANG_ENABLE_MODULES = YES;
	1119	+ CLANG_ENABLE_OBJC_ARC = YES;
	1120	+ CLANG_WARN_BOOL_CONVERSION = YES;
	1121	+ CLANG_WARN_CONSTANT_CONVERSION = YES;
	1122	+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
	1123	+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
	1124	+ CLANG_WARN_EMPTY_BODY = YES;
	1125	+ CLANG_WARN_ENUM_CONVERSION = YES;
	1126	+ CLANG_WARN_INFINITE_RECURSION = YES;
	1127	+ CLANG_WARN_INT_CONVERSION = YES;
	1128	+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
	1129	+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
	1130	+ CLANG_WARN_UNREACHABLE_CODE = YES;
	1131	+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
	1132	+ COPY_PHASE_STRIP = NO;
	1133	+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
	1134	+ ENABLE_NS_ASSERTIONS = NO;
	1135	+ ENABLE_STRICT_OBJC_MSGSEND = YES;
	1136	+ GCC_NO_COMMON_BLOCKS = YES;
	1137	+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
	1138	+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
	1139	+ GCC_WARN_UNDECLARED_SELECTOR = YES;
	1140	+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
	1141	+ GCC_WARN_UNUSED_FUNCTION = YES;
	1142	+ MTL_ENABLE_DEBUG_INFO = NO;
	1143	+ OTHER_CFLAGS = "";
	1144	+ OTHER_LDFLAGS = "";
	1145	+ PRODUCT_NAME = "$(TARGET_NAME)";
	1146	+ };
	1147	+ name = Release;
	1148	+ };
1023	1149	E4CB370D1FE2C1F7001BB75E /* Debug */ = {
1024	1150	isa = XCBuildConfiguration;
1025	1151	buildSettings = {

		@@ -1148,7 +1274,16 @@
1148	1274	defaultConfigurationIsVisible = 0;
1149	1275	defaultConfigurationName = Release;
1150	1276	};
1151		- E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby (Windows)" */ = {
	1277	+ E4B710FB2306BC80000A77EB /* Build configuration list for PBXLegacyTarget "Molby_win64" */ = {
	1278	+ isa = XCConfigurationList;
	1279	+ buildConfigurations = (
	1280	+ E4B710FC2306BC80000A77EB /* Debug */,
	1281	+ E4B710FD2306BC80000A77EB /* Release */,
	1282	+ );
	1283	+ defaultConfigurationIsVisible = 0;
	1284	+ defaultConfigurationName = Release;
	1285	+ };
	1286	+ E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby_win32" */ = {
1152	1287	isa = XCConfigurationList;
1153	1288	buildConfigurations = (
1154	1289	E4CB370D1FE2C1F7001BB75E /* Debug */,

		@@ -1157,7 +1292,7 @@
1157	1292	defaultConfigurationIsVisible = 0;
1158	1293	defaultConfigurationName = Release;
1159	1294	};
1160		- E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby (Mac Archive)" */ = {
	1295	+ E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby_archive" */ = {
1161	1296	isa = XCConfigurationList;
1162	1297	buildConfigurations = (
1163	1298	E4CB37111FE4FF0E001BB75E /* Debug */,

Binary files a/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate and b/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate differ

--- a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Archive.xcscheme

+++ b/build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby_Archive.xcscheme

		@@ -15,8 +15,8 @@
15	15	<BuildableReference
16	16	BuildableIdentifier = "primary"
17	17	BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
18		- BuildableName = "Molby (Mac Archive)"
19		- BlueprintName = "Molby (Mac Archive)"
	18	+ BuildableName = "Molby_archive"
	19	+ BlueprintName = "Molby_archive"
20	20	ReferencedContainer = "container:Molby.xcodeproj">
21	21	</BuildableReference>
22	22	</BuildActionEntry>

		@@ -46,8 +46,8 @@
46	46	<BuildableReference
47	47	BuildableIdentifier = "primary"
48	48	BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
49		- BuildableName = "Molby (Mac Archive)"
50		- BlueprintName = "Molby (Mac Archive)"
	49	+ BuildableName = "Molby_archive"
	50	+ BlueprintName = "Molby_archive"
51	51	ReferencedContainer = "container:Molby.xcodeproj">
52	52	</BuildableReference>
53	53	</MacroExpansion>

		@@ -64,8 +64,8 @@
64	64	<BuildableReference
65	65	BuildableIdentifier = "primary"
66	66	BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
67		- BuildableName = "Molby (Mac Archive)"
68		- BlueprintName = "Molby (Mac Archive)"
	67	+ BuildableName = "Molby_archive"
	68	+ BlueprintName = "Molby_archive"
69	69	ReferencedContainer = "container:Molby.xcodeproj">
70	70	</BuildableReference>
71	71	</MacroExpansion>

--- a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Windows.xcscheme

+++ /dev/null

		@@ -1,80 +0,0 @@
1		-<?xml version="1.0" encoding="UTF-8"?>
2		-<Scheme
3		- LastUpgradeVersion = "0820"
4		- version = "1.3">
5		- <BuildAction
6		- parallelizeBuildables = "YES"
7		- buildImplicitDependencies = "YES">
8		- <BuildActionEntries>
9		- <BuildActionEntry
10		- buildForTesting = "YES"
11		- buildForRunning = "YES"
12		- buildForProfiling = "YES"
13		- buildForArchiving = "YES"
14		- buildForAnalyzing = "YES">
15		- <BuildableReference
16		- BuildableIdentifier = "primary"
17		- BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
18		- BuildableName = "Molby (Windows)"
19		- BlueprintName = "Molby (Windows)"
20		- ReferencedContainer = "container:Molby.xcodeproj">
21		- </BuildableReference>
22		- </BuildActionEntry>
23		- </BuildActionEntries>
24		- </BuildAction>
25		- <TestAction
26		- buildConfiguration = "Debug"
27		- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28		- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29		- shouldUseLaunchSchemeArgsEnv = "YES">
30		- <Testables>
31		- </Testables>
32		- <AdditionalOptions>
33		- </AdditionalOptions>
34		- </TestAction>
35		- <LaunchAction
36		- buildConfiguration = "Debug"
37		- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38		- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39		- launchStyle = "0"
40		- useCustomWorkingDirectory = "NO"
41		- ignoresPersistentStateOnLaunch = "NO"
42		- debugDocumentVersioning = "YES"
43		- debugServiceExtension = "internal"
44		- allowLocationSimulation = "YES">
45		- <MacroExpansion>
46		- <BuildableReference
47		- BuildableIdentifier = "primary"
48		- BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
49		- BuildableName = "Molby (Windows)"
50		- BlueprintName = "Molby (Windows)"
51		- ReferencedContainer = "container:Molby.xcodeproj">
52		- </BuildableReference>
53		- </MacroExpansion>
54		- <AdditionalOptions>
55		- </AdditionalOptions>
56		- </LaunchAction>
57		- <ProfileAction
58		- buildConfiguration = "Release"
59		- shouldUseLaunchSchemeArgsEnv = "YES"
60		- savedToolIdentifier = ""
61		- useCustomWorkingDirectory = "NO"
62		- debugDocumentVersioning = "YES">
63		- <MacroExpansion>
64		- <BuildableReference
65		- BuildableIdentifier = "primary"
66		- BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
67		- BuildableName = "Molby (Windows)"
68		- BlueprintName = "Molby (Windows)"
69		- ReferencedContainer = "container:Molby.xcodeproj">
70		- </BuildableReference>
71		- </MacroExpansion>
72		- </ProfileAction>
73		- <AnalyzeAction
74		- buildConfiguration = "Debug">
75		- </AnalyzeAction>
76		- <ArchiveAction
77		- buildConfiguration = "Release"
78		- revealArchiveInOrganizer = "YES">
79		- </ArchiveAction>
80		-</Scheme>

--- a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist

+++ b/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist

		@@ -4,25 +4,30 @@
4	4	<dict>
5	5	<key>SchemeUserState</key>
6	6	<dict>
7		- <key>Molby.xcscheme</key>
	7	+ <key>Molby.xcscheme_^#shared#^_</key>
8	8	<dict>
9	9	<key>orderHint</key>
10	10	<integer>0</integer>
11	11	</dict>
12		- <key>Molby_Archive.xcscheme</key>
	12	+ <key>Molby_Archive.xcscheme_^#shared#^_</key>
13	13	<dict>
14	14	<key>orderHint</key>
15		- <integer>3</integer>
	15	+ <integer>2</integer>
16	16	</dict>
17		- <key>Molby_Windows.xcscheme</key>
	17	+ <key>Molby_command.xcscheme_^#shared#^_</key>
18	18	<dict>
19	19	<key>orderHint</key>
20		- <integer>2</integer>
	20	+ <integer>1</integer>
21	21	</dict>
22		- <key>Molby_command.xcscheme</key>
	22	+ <key>Molby_win32.xcscheme_^#shared#^_</key>
23	23	<dict>
24	24	<key>orderHint</key>
25		- <integer>1</integer>
	25	+ <integer>3</integer>
	26	+ </dict>
	27	+ <key>Molby_win64.xcscheme_^#shared#^_</key>
	28	+ <dict>
	29	+ <key>orderHint</key>
	30	+ <integer>4</integer>
26	31	</dict>
27	32	</dict>
28	33	<key>SuppressBuildableAutocreation</key>

		@@ -37,11 +42,6 @@
37	42	<key>primary</key>
38	43	<true/>
39	44	</dict>
40		- <key>E4CB370B1FE2C1F7001BB75E</key>
41		- <dict>
42		- <key>primary</key>
43		- <true/>
44		- </dict>
45	45	<key>E4CB370F1FE4FF0E001BB75E</key>
46	46	<dict>
47	47	<key>primary</key>

--- a/build-xcode/buildInfo.c

+++ b/build-xcode/buildInfo.c

		@@ -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;

--- a/build-xcode/buildInfo.txt

+++ b/build-xcode/buildInfo.txt

		@@ -1 +1 @@
1		-last_build = "2019-08-16 01:27:22 JST"
	1	+last_build = "2019-08-16 21:40:23 JST"

--- a/record_build_date.sh

+++ b/record_build_date.sh

		@@ -1,8 +1,8 @@
1	1	#!/bin/sh
2		-# Usage: sh ../record_build_date.sh [--with-svn-status]
	2	+# Usage: sh ../record_build_date.sh [--with-svn-status] > buildInfo.c
3	3	LAST_BUILD=`date '+%Y-%m-%d %H:%M:%S %Z'`
4	4	echo "last_build = \"$LAST_BUILD\"" > buildInfo.txt
5		-echo "char *gLastBuildString = \"$LAST_BUILD\";" > buildInfo.c
	5	+echo "volatile char *gLastBuildString = \"$LAST_BUILD\";"
6	6	if [ "$1" = "--with-svn-status" ]; then
7	7	REVISION_INFO=`(cd ..; svn status -v . --depth=empty \| awk '{print $1}')`
8	8	echo $REVISION_INFO > ../revisionInfo.txt

		@@ -12,4 +12,4 @@ else
12	12	REVISION_INFO=0
13	13	fi
14	14	fi
15		-echo "int gRevisionNumber = $REVISION_INFO;" >> buildInfo.c
	15	+echo "volatile int gRevisionNumber = $REVISION_INFO;"

--- a/wxSources/RubyDialogFrame.cpp

+++ b/wxSources/RubyDialogFrame.cpp

		@@ -1740,7 +1740,7 @@ RubyDialogCallback_setFont(RDDeviceContext dc, void *args)
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		- long style = (long)(args[i + 1]);
	1743	+ long style = (intptr_t)(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 @@ RubyDialogCallback_setFont(RDDeviceContext dc, void *args)
1750	1750	font.SetStyle(style);
1751	1751	} else if (strcmp((const char *)args[i], "family") == 0) {
1752	1752	wxFontFamily family;
1753		- j = (long)(args[i + 1]);
	1753	+ j = (intptr_t)(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 @@ RubyDialogCallback_setFont(RDDeviceContext dc, void *args)
1761	1761	font.SetFamily(family);
1762	1762	} else if (strcmp((const char *)args[i], "weight") == 0) {
1763	1763	wxFontWeight weight;
1764		- j = (long)(args[i + 1]);
	1764	+ j = (intptr_t)(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 @@ RubyDialogCallback_setPen(RDDeviceContext dc, void *args)
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		- long style = (long)(args[i + 1]);
	1796	+ long style = (intptr_t)(args[i + 1]);
1797	1797	switch (style) {
1798	1798	case 0: style = wxSOLID; break;
1799	1799	case 1: style = wxTRANSPARENT; break;

旧リポジトリブラウザで表示

Molby - 分子モデリングソフトウェア Fork

Molby: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

Molby - 分子モデリングソフトウェア
Fork