Xcode settings are restructured

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

diff --git a/Makefile b/Makefile
index faa0b82..9170dc7 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,40 +1,31 @@
-ifeq ($(TARGET_PLATFORM),MAC)
- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
- WX_LIB_DIR = $(WX_DIR)/osx-build/lib
- WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/osx_cocoa-unicode-static-3.0
- WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_FILE_OFFSET_BITS=64 -D__WXMAC__ -D__WXOSX__ -D__WXOSX_COCOA__
- 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 
- 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
- LD_EXTRA_FLAGS = -framework Accelerate -framework GLUT -L$(PWD)/../../fftw-3.3.2/osx-build/lib -lfftw3
- RUBY_DIR = $(PWD)/../../ruby-1.8.7-p160
- RUBY_CFLAGS = -isystem $(RUBY_DIR)/osx-build/include
- RUBY_LDFLAGS = -L$(RUBY_DIR)/osx-build/lib -lruby-static -lenc -ltrans
- EXECUTABLE = Molby
- EXE_SUFFIX =
-endif
-
 ifeq ($(TARGET_PLATFORM),MSW)
- ifneq ($(CROSS_COMPILE),)
+ ifeq ($(TARGET_ARCH),x86_64)
+  TOOL_PREFIX = x86_64-w64-mingw32-
+  MSW_BUILD = build-win
+  LIB_SUFFIX = -3.0-x86_64-w64-mingw32
+  WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
+ else
   TOOL_PREFIX = i686-w64-mingw32-
-  CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
-  MSW_BUILD = mswx-build
+#  CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
+  MSW_BUILD = build-win32
   LIB_SUFFIX = -3.0-i686-w64-mingw32
   WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
- else
-  MSW_BUILD = msw-build
-  LIB_SUFFIX = -3.0
  endif
- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
+ WX_DIR = $(PWD)/../../wxWidgets-3.0.3
  WX_LIB_DIR = $(WX_DIR)/$(MSW_BUILD)/lib
  WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/$(TOOL_PREFIX)msw-unicode-static-3.0
  WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__
  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
  CPP_EXTRA_FLAGS = -isystem $(PWD)/../../CLAPACK-3.1.1.1-mingw/INCLUDE -isystem $(PWD)/../../fftw-3.3.2/$(MSW_BUILD)/include -I$(PWD)/../MolLib
- 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++
+ 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
  RUBY_DIR = $(PWD)/../../ruby-2.0.0-p353
- 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
-# RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lmsvcrt-ruby200 -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
- RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
+ ifeq ($(TARGET_ARCH),x86_64)
+  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
+  RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lx64-msvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
+ else
+  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
+  RUBY_LDFLAGS = -L$(RUBY_DIR)/$(MSW_BUILD)/lib -lmsvcrt-ruby200-static -lws2_32 -lshlwapi -limagehlp -lenc -ltrans
+ endif
  EXECUTABLE = _Molby.exe_
  FINAL_EXECUTABLE = Molby.exe
  EXE_SUFFIX = .exe
@@ -70,8 +61,8 @@ else
 endif
 MAKEDIR = $(PWD)
 DESTDIR = $(PWD)/$(DESTPREFIX)
-CFLAGS = $(CPPFLAGS) $(COPT) $(CPP_EXTRA_FLAGS) $(RUBY_CFLAGS) $(WX_CPPFLAGS)
-LDFLAGS = $(WX_LDFLAGS) $(LD_EXTRA_FLAGS) $(RUBY_LDFLAGS)
+CFLAGS = $(CPPFLAGS) $(COPT) $(RUBY_CFLAGS) $(WX_CPPFLAGS) $(CPP_EXTRA_FLAGS)
+LDFLAGS = $(WX_LDFLAGS) $(RUBY_LDFLAGS) $(LD_EXTRA_FLAGS)
 export CFLAGS
 export LDFLAGS
 export DESTDIR
@@ -102,14 +93,16 @@ RESOURCE = molby_rc.o
 #  The following HOMETEMP kludges are to work around a bug where '#include "..."' 
 #  does not work when the include path is on the C: drive whereas the source is 
 #  on the Z: drive. 2009.7.24. Toshi Nagata
-HOMETEMP = $(HOME)/__molby_temp_build__
+#  2019.8.16. We no longer need this kludge
+#HOMETEMP = $(HOME)/__molby_temp_build__
 $(DESTPREFIX)/$(RESOURCE) : molby.rc
-       mkdir -p $(HOMETEMP)/$(MSW_BUILD) $(HOMETEMP)/bitmaps
-       cp molby.rc $(HOMETEMP)/$(MSW_BUILD)
-       cp ../bitmaps/*.ico $(HOMETEMP)/bitmaps
-       (cd $(HOMETEMP)/$(MSW_BUILD); $(TOOL_PREFIX)windres -i molby.rc -o molby_rc.o -I$(WX_DIR)/include)
-       cp $(HOMETEMP)/$(MSW_BUILD)/molby_rc.o $@
-       rm -rf $(HOMETEMP)
+       $(TOOL_PREFIX)windres -i molby.rc -o $(DESTPREFIX)/$(RESOURCE) -I$(WX_DIR)/include
+#      mkdir -p $(HOMETEMP)/$(MSW_BUILD) $(HOMETEMP)/bitmaps
+#      cp molby.rc $(HOMETEMP)/$(MSW_BUILD)
+#      cp ../bitmaps/*.ico $(HOMETEMP)/bitmaps
+#      (cd $(HOMETEMP)/$(MSW_BUILD); $(TOOL_PREFIX)windres -i molby.rc -o molby_rc.o -I$(WX_DIR)/include)
+#      cp $(HOMETEMP)/$(MSW_BUILD)/molby_rc.o $@
+#      rm -rf $(HOMETEMP)
 endif
 
 depend: cleandep $(DESTPREFIX) $(OBJECTS:%.o=$(DESTPREFIX)/%.d) $(EXTRA_OBJECTS:%.o=$(DESTPREFIX)/%.d)
@@ -145,11 +138,8 @@ $(DESTPREFIX)/Ruby_bind.a : ../MolLib/Ruby_bind/*.[ch]
 ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
 DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
 $(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS) ../revisionInfo.txt
-ifeq ($(TARGET_PLATFORM),MAC)
-       sh ../record_build_date.sh --with-svn-status
-endif
 ifeq ($(TARGET_PLATFORM),MSW)
-       sh ../record_build_date.sh
+       sh ../record_build_date.sh --with-svn-status >buildInfo.c
 endif
        $(CC) -c buildInfo.c -o $(DESTPREFIX)/buildInfo.o $(CFLAGS)
        $(CPP) -o $@ $(DESTOBJECTS) $(DESTPREFIX)/buildInfo.o $(CFLAGS) $(LDFLAGS)
@@ -173,7 +163,7 @@ ifeq ($(TARGET_PLATFORM),MSW)
        rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
        mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
        cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
-       cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
+#      cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
        cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
        cp -r amber11 $(DESTPREFIX)/$(PRODUCT_DIR)
        cp -r ortep3 $(DESTPREFIX)/$(PRODUCT_DIR)
@@ -186,7 +176,7 @@ install: setup
 
 setup: build/release/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
        mkdir -p ../latest_binaries
-ifneq ($(CROSS_COMPILE),)
+ifneq ($(WINE_PATH),)
        ($(WINE_PATH)/wine ../../Inno\ Setup\ 5/ISCC.exe molby.iss || exit 1)
 else
        (/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5/iscc molby.iss || exit 1)

diff --git a/build-win/Makefile b/build-win/Makefile
index ab27bb2..28801f5 100755 (executable)
--- a/build-win/Makefile
+++ b/build-win/Makefile
@@ -1,5 +1,6 @@
 TARGET_PLATFORM = MSW
-CROSS_COMPILE = 1
+#CROSS_COMPILE = 1
+TARGET_ARCH = x86_64
 PWD = $(shell echo $$PWD)
 ifeq ($(CONFIGURATION),Debug)
   DEBUG = 1

diff --git a/build-win/molby.iss b/build-win/molby.iss
index 955cb13..7a2746d 100755 (executable)
--- a/build-win/molby.iss
+++ b/build-win/molby.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName = Molby
-AppVerName = Molby (v1.0b3)
+AppVerName = Molby (v1.0)
 DefaultDirName = {pf}\Molby
 DefaultGroupName = Molby
 UninstallDisplayIcon = {app}\Molby.exe
@@ -8,7 +8,6 @@ OutputBaseFileName = SetupMolbyWin
 
 [Files]
 Source: "build\release\Molby\Molby.exe"; DestDir: {app}
-Source: "build\release\Molby\mingwm10.dll"; DestDir: {app}
 Source: "build\release\Molby\amber11\bin\*"; DestDir: {app}\amber11\bin
 Source: "build\release\Molby\amber11\dat\antechamber\*"; DestDir: {app}\amber11\dat\antechamber
 Source: "build\release\Molby\amber11\dat\leap\parm\*"; DestDir: {app}\amber11\dat\leap\parm

diff --git a/build-xcode/.svnignore b/build-xcode/.svnignore
index 1746416..bb8c639 100644 (file)
--- a/build-xcode/.svnignore
+++ b/build-xcode/.svnignore
@@ -1,6 +1,6 @@
 ortep3
 amber11
 build
-buildInfo.*
+buildInfo*
 .*
 

diff --git a/build-xcode/Molby-Info.plist b/build-xcode/Molby-Info.plist
index 08b4636..399617c 100755 (executable)
--- a/build-xcode/Molby-Info.plist
+++ b/build-xcode/Molby-Info.plist
@@ -36,6 +36,6 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>v0.6.5</string>
+       <string>v1.0</string>
 </dict>
 </plist>

diff --git a/build-xcode/Molby.xcodeproj/.svnignore b/build-xcode/Molby.xcodeproj/.svnignore
index ee32cb9..a7e7ac2 100644 (file)
--- a/build-xcode/Molby.xcodeproj/.svnignore
+++ b/build-xcode/Molby.xcodeproj/.svnignore
@@ -2,3 +2,5 @@
 *.mode1v3
 *.pbxuser
 project.xcworkspace
+xcuserdata
+

diff --git a/build-xcode/Molby.xcodeproj/project.pbxproj b/build-xcode/Molby.xcodeproj/project.pbxproj
index a402e47..c24d369 100644 (file)
--- a/build-xcode/Molby.xcodeproj/project.pbxproj
+++ b/build-xcode/Molby.xcodeproj/project.pbxproj
@@ -7,9 +7,9 @@
        objects = {
 
 /* Begin PBXAggregateTarget section */
-               E4CB370F1FE4FF0E001BB75E /* Molby (Mac Archive) */ = {
+               E4CB370F1FE4FF0E001BB75E /* Molby_archive */ = {
                        isa = PBXAggregateTarget;
-                       buildConfigurationList = E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby (Mac Archive)" */;
+                       buildConfigurationList = E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby_archive" */;
                        buildPhases = (
                                E4CB37171FE4FF42001BB75E /* ShellScript */,
                        );
@@ -17,8 +17,9 @@
                                E4CB37141FE4FF23001BB75E /* PBXTargetDependency */,
                                E4CB37161FE4FF23001BB75E /* PBXTargetDependency */,
                                E4CB37191FE50707001BB75E /* PBXTargetDependency */,
+                               E4B710FF2306BD0A000A77EB /* PBXTargetDependency */,
                        );
-                       name = "Molby (Mac Archive)";
+                       name = Molby_archive;
                        productName = "Molby (Mac Archive)";
                };
 /* End PBXAggregateTarget section */
@@ -48,6 +49,7 @@
                E420BE24188574F600A2B983 /* wxKillAddition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E420BE21188574F600A2B983 /* wxKillAddition.cpp */; };
                E45B94621A170B9A008E95EB /* docview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45B94611A170B9A008E95EB /* docview.cpp */; };
                E4653CB118A0CC7D0022377B /* textctrl_addition.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4653CB018A0CC7D0022377B /* textctrl_addition.mm */; };
+               E49B3DF72306D9F500422E13 /* buildInfo_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */; };
                E49BFBFA1886E72000188237 /* MyVersion.c in Sources */ = {isa = PBXBuildFile; fileRef = E420BE18188574D700A2B983 /* MyVersion.c */; };
                E49BFBFB1886E74600188237 /* IntGroup.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC777D183E4F3F0064FB2E /* IntGroup.c */; };
                E49BFBFF1886E74600188237 /* MainViewCommon.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC7781183E4F3F0064FB2E /* MainViewCommon.c */; };
@@ -69,7 +71,6 @@
                E49BFC191886E76F00188237 /* ruby_bind.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC779F183E4F3F0064FB2E /* ruby_bind.c */; };
                E49BFC1B1886E77000188237 /* ruby_md.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC77A2183E4F3F0064FB2E /* ruby_md.c */; };
                E49BFC1C1886E77100188237 /* ruby_types.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC77A3183E4F3F0064FB2E /* ruby_types.c */; };
-               E49BFC1F1886E78600188237 /* buildInfo.c in Sources */ = {isa = PBXBuildFile; fileRef = E4FC7CA5183F94D30064FB2E /* buildInfo.c */; };
                E49BFC2C1886E88A00188237 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4FC7810183E50DC0064FB2E /* Accelerate.framework */; };
                E4ACACE718C6D32300F08B67 /* ortep3 in Resources */ = {isa = PBXBuildFile; fileRef = E4ACACE418C6D32300F08B67 /* ortep3 */; };
                E4D379A219C87C2200636D28 /* modalwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4D379A119C87C2200636D28 /* modalwindow.cpp */; };
@@ -119,6 +120,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+               E4B710FE2306BD0A000A77EB /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = E4B710FA2306BC80000A77EB;
+                       remoteInfo = Molby_win64;
+               };
                E4CB37131FE4FF23001BB75E /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -202,6 +210,7 @@
                E420BE21188574F600A2B983 /* wxKillAddition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wxKillAddition.cpp; sourceTree = "<group>"; };
                E45B94611A170B9A008E95EB /* docview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = docview.cpp; sourceTree = "<group>"; };
                E4653CB018A0CC7D0022377B /* textctrl_addition.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = textctrl_addition.mm; sourceTree = "<group>"; };
+               E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buildInfo_cmd.c; sourceTree = "<group>"; };
                E49BFB761886E2E400188237 /* Molby_command */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Molby_command; sourceTree = BUILT_PRODUCTS_DIR; };
                E4ACACE418C6D32300F08B67 /* ortep3 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ortep3; sourceTree = "<group>"; };
                E4CB37081FDD4654001BB75E /* OpenGL_extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OpenGL_extensions.c; sourceTree = "<group>"; };
@@ -344,6 +353,7 @@
                                E4FC7C28183E55820064FB2E /* wxSources */,
                                E4FC7779183E4F3F0064FB2E /* MolLib */,
                                E4FC7CA5183F94D30064FB2E /* buildInfo.c */,
+                               E49B3DF62306D9F500422E13 /* buildInfo_cmd.c */,
                        );
                        name = Sources;
                        sourceTree = "<group>";
@@ -526,17 +536,31 @@
 /* End PBXGroup section */
 
 /* Begin PBXLegacyTarget section */
-               E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */ = {
+               E4B710FA2306BC80000A77EB /* Molby_win64 */ = {
                        isa = PBXLegacyTarget;
-                       buildArgumentsString = "PATH=/usr/local/mingw-w32/bin:$PATH make $(ACTION)";
-                       buildConfigurationList = E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby (Windows)" */;
+                       buildArgumentsString = "PATH=/usr/local/homebrew/bin:$PATH make $(ACTION)";
+                       buildConfigurationList = E4B710FB2306BC80000A77EB /* Build configuration list for PBXLegacyTarget "Molby_win64" */;
                        buildPhases = (
                        );
                        buildToolPath = /usr/bin/env;
                        buildWorkingDirectory = "$(PROJECT_DIR)/../build-win";
                        dependencies = (
                        );
-                       name = "Molby (Windows)";
+                       name = Molby_win64;
+                       passBuildSettingsInEnvironment = 1;
+                       productName = "Molby (Windows)";
+               };
+               E4CB370B1FE2C1F7001BB75E /* Molby_win32 */ = {
+                       isa = PBXLegacyTarget;
+                       buildArgumentsString = "PATH=/usr/local/homebrew/bin:$PATH make $(ACTION)";
+                       buildConfigurationList = E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby_win32" */;
+                       buildPhases = (
+                       );
+                       buildToolPath = /usr/bin/env;
+                       buildWorkingDirectory = "$(PROJECT_DIR)/../build-win32";
+                       dependencies = (
+                       );
+                       name = Molby_win32;
                        passBuildSettingsInEnvironment = 1;
                        productName = "Molby (Windows)";
                };
@@ -567,6 +591,7 @@
                        isa = PBXNativeTarget;
                        buildConfigurationList = E49BFB7A1886E30200188237 /* Build configuration list for PBXNativeTarget "Molby_command" */;
                        buildPhases = (
+                               E49B3DF82306DB1800422E13 /* ShellScript */,
                                E49BFB731886E2E400188237 /* Sources */,
                                E49BFB741886E2E400188237 /* Frameworks */,
                                E4DF3BCD1FDCEAEE0014F980 /* CopyFiles */,
@@ -614,8 +639,9 @@
                        targets = (
                                8D1107260486CEB800E47090 /* Molby */,
                                E49BFB751886E2E400188237 /* Molby_command */,
-                               E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */,
-                               E4CB370F1FE4FF0E001BB75E /* Molby (Mac Archive) */,
+                               E4CB370B1FE2C1F7001BB75E /* Molby_win32 */,
+                               E4B710FA2306BC80000A77EB /* Molby_win64 */,
+                               E4CB370F1FE4FF0E001BB75E /* Molby_archive */,
                        );
                };
 /* End PBXProject section */
@@ -661,6 +687,23 @@
                        shellPath = /bin/sh;
                        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";
                };
+               E49B3DF82306DB1800422E13 /* ShellScript */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputFileListPaths = (
+                       );
+                       inputPaths = (
+                       );
+                       outputFileListPaths = (
+                       );
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status >buildInfo_cmd.c\n";
+               };
                E4CB37171FE4FF42001BB75E /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;
@@ -672,7 +715,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       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";
+                       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";
                };
                E4FC7B57183E516E0064FB2E /* ShellScript */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -685,7 +728,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status\n";
+                       shellScript = "cd $PROJECT_DIR; sh ../record_build_date.sh --with-svn-status >buildInfo.c\n";
                };
 /* End PBXShellScriptBuildPhase section */
 
@@ -764,6 +807,7 @@
                                E49BFC111886E74600188237 /* cmdtool_stubs.c in Sources */,
                                E49BFC121886E75700188237 /* MDCore.c in Sources */,
                                E49BFC131886E75C00188237 /* MDEwald.c in Sources */,
+                               E49B3DF72306D9F500422E13 /* buildInfo_cmd.c in Sources */,
                                E49BFC141886E75D00188237 /* MDForce.c in Sources */,
                                E49BFC151886E75D00188237 /* MDGraphite.c in Sources */,
                                E49BFC161886E75E00188237 /* MDPressure.c in Sources */,
@@ -771,13 +815,17 @@
                                E49BFC191886E76F00188237 /* ruby_bind.c in Sources */,
                                E49BFC1B1886E77000188237 /* ruby_md.c in Sources */,
                                E49BFC1C1886E77100188237 /* ruby_types.c in Sources */,
-                               E49BFC1F1886E78600188237 /* buildInfo.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+               E4B710FF2306BD0A000A77EB /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = E4B710FA2306BC80000A77EB /* Molby_win64 */;
+                       targetProxy = E4B710FE2306BD0A000A77EB /* PBXContainerItemProxy */;
+               };
                E4CB37141FE4FF23001BB75E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
                        target = 8D1107260486CEB800E47090 /* Molby */;
@@ -790,7 +838,7 @@
                };
                E4CB37191FE50707001BB75E /* PBXTargetDependency */ = {
                        isa = PBXTargetDependency;
-                       target = E4CB370B1FE2C1F7001BB75E /* Molby (Windows) */;
+                       target = E4CB370B1FE2C1F7001BB75E /* Molby_win32 */;
                        targetProxy = E4CB37181FE50707001BB75E /* PBXContainerItemProxy */;
                };
 /* End PBXTargetDependency section */
@@ -917,37 +965,31 @@
                C01FCF4F08A954540054247B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD)";
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.5;
+                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SDKROOT = macosx10.6;
                        };
                        name = Debug;
                };
                C01FCF5008A954540054247B /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
+                               ARCHS = "$(ARCHS_STANDARD)";
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 2;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.5;
+                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PREBINDING = NO;
-                               SDKROOT = macosx10.5;
+                               SDKROOT = macosx10.6;
                        };
                        name = Release;
                };
@@ -1020,6 +1062,90 @@
                        };
                        name = Release;
                };
+               E4B710FC2306BC80000A77EB /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INFINITE_RECURSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUGGING_SYMBOLS = YES;
+                               DEBUG_INFORMATION_FORMAT = dwarf;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_DYNAMIC_NO_PIC = NO;
+                               GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "DEBUG=1",
+                                       "$(inherited)",
+                               );
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               MTL_ENABLE_DEBUG_INFO = YES;
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = "";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               E4B710FD2306BC80000A77EB /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               ALWAYS_SEARCH_USER_PATHS = NO;
+                               CLANG_ANALYZER_NONNULL = YES;
+                               CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+                               CLANG_CXX_LIBRARY = "libc++";
+                               CLANG_ENABLE_MODULES = YES;
+                               CLANG_ENABLE_OBJC_ARC = YES;
+                               CLANG_WARN_BOOL_CONVERSION = YES;
+                               CLANG_WARN_CONSTANT_CONVERSION = YES;
+                               CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+                               CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+                               CLANG_WARN_EMPTY_BODY = YES;
+                               CLANG_WARN_ENUM_CONVERSION = YES;
+                               CLANG_WARN_INFINITE_RECURSION = YES;
+                               CLANG_WARN_INT_CONVERSION = YES;
+                               CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+                               CLANG_WARN_SUSPICIOUS_MOVE = YES;
+                               CLANG_WARN_UNREACHABLE_CODE = YES;
+                               CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+                               COPY_PHASE_STRIP = NO;
+                               DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+                               ENABLE_NS_ASSERTIONS = NO;
+                               ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+                               GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+                               GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+                               GCC_WARN_UNUSED_FUNCTION = YES;
+                               MTL_ENABLE_DEBUG_INFO = NO;
+                               OTHER_CFLAGS = "";
+                               OTHER_LDFLAGS = "";
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
                E4CB370D1FE2C1F7001BB75E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -1148,7 +1274,16 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby (Windows)" */ = {
+               E4B710FB2306BC80000A77EB /* Build configuration list for PBXLegacyTarget "Molby_win64" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               E4B710FC2306BC80000A77EB /* Debug */,
+                               E4B710FD2306BC80000A77EB /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
+               E4CB370C1FE2C1F7001BB75E /* Build configuration list for PBXLegacyTarget "Molby_win32" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                E4CB370D1FE2C1F7001BB75E /* Debug */,
@@ -1157,7 +1292,7 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby (Mac Archive)" */ = {
+               E4CB37101FE4FF0E001BB75E /* Build configuration list for PBXAggregateTarget "Molby_archive" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                E4CB37111FE4FF0E001BB75E /* Debug */,

diff --git a/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate b/build-xcode/Molby.xcodeproj/project.xcworkspace/xcuserdata/toshi_n.xcuserdatad/UserInterfaceState.xcuserstate
index 2b121a7..96efec1 100644 (file)
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

diff --git a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby.xcscheme b/build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby.xcscheme
similarity index 100%
rename from build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby.xcscheme
rename to build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby.xcscheme

diff --git a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Archive.xcscheme b/build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby_Archive.xcscheme
similarity index 89%
rename from build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Archive.xcscheme
rename to build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby_Archive.xcscheme
index f31c651..93bf7d8 100644 (file)
--- 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 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
-               BuildableName = "Molby (Mac Archive)"
-               BlueprintName = "Molby (Mac Archive)"
+               BuildableName = "Molby_archive"
+               BlueprintName = "Molby_archive"
                ReferencedContainer = "container:Molby.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,8 +46,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
-            BuildableName = "Molby (Mac Archive)"
-            BlueprintName = "Molby (Mac Archive)"
+            BuildableName = "Molby_archive"
+            BlueprintName = "Molby_archive"
             ReferencedContainer = "container:Molby.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +64,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E4CB370F1FE4FF0E001BB75E"
-            BuildableName = "Molby (Mac Archive)"
-            BlueprintName = "Molby (Mac Archive)"
+            BuildableName = "Molby_archive"
+            BlueprintName = "Molby_archive"
             ReferencedContainer = "container:Molby.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_command.xcscheme b/build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby_command.xcscheme
similarity index 100%
rename from build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_command.xcscheme
rename to build-xcode/Molby.xcodeproj/xcshareddata/xcschemes/Molby_command.xcscheme

diff --git a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Windows.xcscheme b/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Windows.xcscheme
deleted file mode 100644 (file)
index f6157a3..0000000
--- a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/Molby_Windows.xcscheme
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0820"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
-               BuildableName = "Molby (Windows)"
-               BlueprintName = "Molby (Windows)"
-               ReferencedContainer = "container:Molby.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
-            BuildableName = "Molby (Windows)"
-            BlueprintName = "Molby (Windows)"
-            ReferencedContainer = "container:Molby.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E4CB370B1FE2C1F7001BB75E"
-            BuildableName = "Molby (Windows)"
-            BlueprintName = "Molby (Windows)"
-            ReferencedContainer = "container:Molby.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

diff --git a/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist b/build-xcode/Molby.xcodeproj/xcuserdata/toshi_n.xcuserdatad/xcschemes/xcschememanagement.plist
index 3255dbb..7b6671c 100644 (file)
--- 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 @@
 <dict>
        <key>SchemeUserState</key>
        <dict>
-               <key>Molby.xcscheme</key>
+               <key>Molby.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
                        <integer>0</integer>
                </dict>
-               <key>Molby_Archive.xcscheme</key>
+               <key>Molby_Archive.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>3</integer>
+                       <integer>2</integer>
                </dict>
-               <key>Molby_Windows.xcscheme</key>
+               <key>Molby_command.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>2</integer>
+                       <integer>1</integer>
                </dict>
-               <key>Molby_command.xcscheme</key>
+               <key>Molby_win32.xcscheme_^#shared#^_</key>
                <dict>
                        <key>orderHint</key>
-                       <integer>1</integer>
+                       <integer>3</integer>
+               </dict>
+               <key>Molby_win64.xcscheme_^#shared#^_</key>
+               <dict>
+                       <key>orderHint</key>
+                       <integer>4</integer>
                </dict>
        </dict>
        <key>SuppressBuildableAutocreation</key>
@@ -37,11 +42,6 @@
                        <key>primary</key>
                        <true/>
                </dict>
-               <key>E4CB370B1FE2C1F7001BB75E</key>
-               <dict>
-                       <key>primary</key>
-                       <true/>
-               </dict>
                <key>E4CB370F1FE4FF0E001BB75E</key>
                <dict>
                        <key>primary</key>

diff --git a/build-xcode/buildInfo.c b/build-xcode/buildInfo.c
index da54352..9c682c0 100644 (file)
--- a/build-xcode/buildInfo.c
+++ b/build-xcode/buildInfo.c
@@ -1,2 +1,2 @@
-char *gLastBuildString = "2019-08-16 01:27:22 JST";
-int gRevisionNumber = 612;
+volatile char *gLastBuildString = "2019-08-16 21:40:23 JST";
+volatile int gRevisionNumber = 617;

diff --git a/build-xcode/buildInfo.txt b/build-xcode/buildInfo.txt
index 92be869..394c4f1 100644 (file)
--- a/build-xcode/buildInfo.txt
+++ b/build-xcode/buildInfo.txt
@@ -1 +1 @@
-last_build = "2019-08-16 01:27:22 JST"
+last_build = "2019-08-16 21:40:23 JST"

diff --git a/record_build_date.sh b/record_build_date.sh
index 54e4dda..946a4fe 100644 (file)
--- a/record_build_date.sh
+++ b/record_build_date.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-#  Usage: sh ../record_build_date.sh [--with-svn-status]
+#  Usage: sh ../record_build_date.sh [--with-svn-status] > buildInfo.c
 LAST_BUILD=`date '+%Y-%m-%d %H:%M:%S %Z'`
 echo "last_build = \"$LAST_BUILD\"" > buildInfo.txt
-echo "char *gLastBuildString = \"$LAST_BUILD\";" > buildInfo.c
+echo "volatile char *gLastBuildString = \"$LAST_BUILD\";"
 if [ "$1" = "--with-svn-status" ]; then
   REVISION_INFO=`(cd ..; svn status -v . --depth=empty | awk '{print $1}')`
   echo $REVISION_INFO > ../revisionInfo.txt
@@ -12,4 +12,4 @@ else
     REVISION_INFO=0
   fi
 fi
-echo "int gRevisionNumber = $REVISION_INFO;" >> buildInfo.c
+echo "volatile int gRevisionNumber = $REVISION_INFO;"

diff --git a/wxSources/RubyDialogFrame.cpp b/wxSources/RubyDialogFrame.cpp
index 506afa5..11f1f91 100644 (file)
--- a/wxSources/RubyDialogFrame.cpp
+++ b/wxSources/RubyDialogFrame.cpp
@@ -1740,7 +1740,7 @@ RubyDialogCallback_setFont(RDDeviceContext *dc, void **args)
                        float size = *((float *)(args[i + 1]));
                        font.SetPointSize((int)size);
                } else if (strcmp((const char *)args[i], "style") == 0) {
-                       long style = (long)(args[i + 1]);
+                       long style = (intptr_t)(args[i + 1]);
                        switch (style) {
                                case 0: style = wxFONTSTYLE_NORMAL; break;
                                case 1: style = wxFONTSTYLE_ITALIC; break;
@@ -1750,7 +1750,7 @@ RubyDialogCallback_setFont(RDDeviceContext *dc, void **args)
                        font.SetStyle(style);
                } else if (strcmp((const char *)args[i], "family") == 0) {
                        wxFontFamily family;
-                       j = (long)(args[i + 1]);
+                       j = (intptr_t)(args[i + 1]);
                        switch (j) {
                                case 0: family = wxFONTFAMILY_DEFAULT; break;
                                case 1: family = wxFONTFAMILY_ROMAN; break;
@@ -1761,7 +1761,7 @@ RubyDialogCallback_setFont(RDDeviceContext *dc, void **args)
                        font.SetFamily(family);
                } else if (strcmp((const char *)args[i], "weight") == 0) {
                        wxFontWeight weight;
-                       j = (long)(args[i + 1]);
+                       j = (intptr_t)(args[i + 1]);
                        switch (j) {
                                case 0: weight = wxFONTWEIGHT_NORMAL; break;
                                case 1: weight = wxFONTWEIGHT_LIGHT; break;
@@ -1793,7 +1793,7 @@ RubyDialogCallback_setPen(RDDeviceContext *dc, void **args)
                                float width = *((float *)(args[i + 1]));
                                pen.SetWidth((int)width);
                        } else if (strcmp((const char *)args[i], "style") == 0) {
-                               long style = (long)(args[i + 1]);
+                               long style = (intptr_t)(args[i + 1]);
                                switch (style) {
                                        case 0: style = wxSOLID; break;
                                        case 1: style = wxTRANSPARENT; break;