X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Makefile;h=fa85e1c91dc7aebf39ebc9c3b6e92a5e846aeb6a;hb=4915e90a4b6e244c0dcd70016c0255066a9ea3ef;hp=9e42fcc239e7fcb45d3dbf4a25d43f69548cc70f;hpb=11d8138fe876ee53b78b373e419ecd8fa35a0c68;p=molby%2FMolby.git

diff --git a/Makefile b/Makefile
index 9e42fcc..fa85e1c 100755
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,45 @@
-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
- EXECUTABLE = Molby
- EXE_SUFFIX =
-endif
-
 ifeq ($(TARGET_PLATFORM),MSW)
- WX_DIR = $(PWD)/../../wxWidgets-3.0.0
- WX_LIB_DIR = $(WX_DIR)/msw-build/lib
- WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/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-3.0 -lopengl32 -lglu32 -lwx_mswu-3.0 -lwxregexu-3.0 -lwxexpat-3.0 -lwxtiff-3.0 -lwxjpeg-3.0 -lwxpng-3.0 -lwxzlib-3.0 -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
- LD_EXTRA_FLAGS = -L$(PWD)/../../CLAPACK-3.1.1.1-mingw/lib -L$(PWD)/../../fftw-3.3.2/msw-build/lib -llapackMinGW -lblasMinGW -lf2c_nomain -lfftw3
+ ifeq ($(TARGET_ARCH),x86_64)
+  TOOL_PREFIX = x86_64-w64-mingw32-
+  MSW_BUILD = build-win
+  LIB_SUFFIX = -3.2-x86_64-w64-mingw32
+  WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
+  PRODUCT_SUFFIX = 64
+  TARGET_ARCH_DEFINE = -DTARGET_ARCH=64
+  SETUP_NAME = SetupMolbyWin
+ else
+  TOOL_PREFIX = i686-w64-mingw32-
+#  CPP_EXTRA_FLAGS += -isystem /usr/local/mingw-w32/mingw/include
+  MSW_BUILD = build-win32
+  LIB_SUFFIX = -3.2-i686-w64-mingw32
+  WINE_PATH=/Applications/EasyWine.app/Contents/Resources/wine/bin
+  PRODUCT_SUFFIX = 32
+#  FINAL_EXECUTABLE_SUFFIX = _32bit
+  TARGET_ARCH_DEFINE = -DTARGET_ARCH=32
+  SETUP_NAME = SetupMolbyWin32
+ endif
+ WX_DIR = $(PWD)/../../wxWidgets-3.2.0
+ WX_LIB_DIR = $(WX_DIR)/$(MSW_BUILD)/lib
+ WX_ARCH_DIR = $(WX_LIB_DIR)/wx/include/$(TOOL_PREFIX)msw-unicode-static-3.2
+ WX_CPPFLAGS = -isystem $(WX_ARCH_DIR) -isystem $(WX_DIR)/include -D_LARGEFIILE_SOURCE=unknown -D__WXMSW__ $(TARGET_ARCH_DEFINE)
+ WX_LDFLAGS = -L$(WX_LIB_DIR) -Wl,--subsystem,windows -mwindows $(WX_LIB_DIR)/libwx_mswu_gl$(LIB_SUFFIX).a -lopengl32 -lglu32 $(WX_LIB_DIR)/libwx_mswu$(LIB_SUFFIX).a -limm32 -lwxtiff$(LIB_SUFFIX) -lwxjpeg$(LIB_SUFFIX) -lwxpng$(LIB_SUFFIX) -lwxregexu$(LIB_SUFFIX) -lwxscintilla$(LIB_SUFFIX) -lwxexpat$(LIB_SUFFIX) -lwxzlib$(LIB_SUFFIX) -lrpcrt4 -loleaut32 -lole32 -luuid -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lws2_32 -lgdi32 -loleacc -lwinhttp
+ 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++ -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
+ 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
+ FINAL_EXECUTABLE = Molby$(FINAL_EXECUTABLE_SUFFIX).exe
  EXE_SUFFIX = .exe
 endif
 
 WXLIB_LIST = core,base,gl,adv
-OBJECTS = ConsoleFrame.o GlobalParameterFrame.o GlobalParameterFilesFrame.o MoleculeView.o MyApp.o MyCommand.o MyDocument.o MyGLCanvas.o MySlider.o MyClipboardData.o ProgressFrame.o MyListCtrl.o MyDocManager.o wxKillAddition.o RubyDialogFrame.o MyIPCSupport.o MyVersion.o MyThread.o MyProgressIndicator.o
+OBJECTS = ConsoleFrame.o GlobalParameterFrame.o GlobalParameterFilesFrame.o MoleculeView.o MyApp.o MyCommand.o MyDocument.o MyGLCanvas.o MySlider.o MyClipboardData.o ProgressFrame.o MyListCtrl.o MyDocManager.o wxKillAddition.o RubyDialogFrame.o MyIPCSupport.o MyVersion.o MyThread.o MyProgressIndicator.o MyToggleButton.o modalwindow.o MyTextCtrl.o
 LIBS = MolLib.a Ruby_bind.a
 RUBY_EXTLIB = scanf.rb
 
@@ -38,11 +47,13 @@ ifeq ($(TARGET_PLATFORM),MAC)
 PRODUCT = Molby.app
 else
 PRODUCT_DIR = Molby
-PRODUCT = $(PRODUCT_DIR)/$(EXECUTABLE)
+PRODUCT = $(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
 endif
 
-CPP = g++
-CC = gcc
+CPP = $(TOOL_PREFIX)g++
+CC = $(TOOL_PREFIX)gcc
+AR = $(TOOL_PREFIX)ar
+RANLIB = $(TOOL_PREFIX)ranlib
 
 ifeq ($(MAKECMDGOALS),debug)
  DEBUG = 1
@@ -55,14 +66,20 @@ else
  DESTPREFIX = build/release
  COPT = -O2 -g
 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
 export CC
+export CPP
+export AR
 export TARGET_PLATFORM
+export TARGET_ARCH
+export RANLIB
+export PWD
 
 release: all
 
@@ -76,26 +93,26 @@ $(DESTPREFIX) :
 amber11 : ../amber11/src/antechamber/*.[ch] ../amber11/src/sqm/*.f ../amber11/src/config.h
 	make -f ../Makefile_amber11
 
-mopac/mopac606$(EXE_SUFFIX) : 
-	make -f ../Makefile_mopac606_nbo
-
 ortep3/ortep3$(EXE_SUFFIX) :
 	make -f ../Makefile_ortep3
 
 ifeq ($(TARGET_PLATFORM),MSW)
-EXTRA_OBJECTS = listctrl.o window_msw.o textctrl_msw.o OpenGL_extensions.o
+#EXTRA_OBJECTS = window_msw.o textctrl_msw.o OpenGL_extensions.o
+EXTRA_OBJECTS = OpenGL_extensions.o
 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; 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)
@@ -130,47 +147,47 @@ $(DESTPREFIX)/Ruby_bind.a : ../MolLib/Ruby_bind/*.[ch]
 
 ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
 DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
-$(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS)
-ifeq ($(TARGET_PLATFORM),MAC)
-	sh ../record_build_date.sh --with-svn-status
-endif
+$(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS) ../revisionInfo.txt
 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)
 
-$(DESTPREFIX)/$(PRODUCT) : $(DESTPREFIX)/$(EXECUTABLE) ../Scripts/*.rb amber11 mopac/mopac606$(EXE_SUFFIX) ortep3/ortep3$(EXE_SUFFIX)
-ifeq ($(TARGET_PLATFORM),MAC)
-	rm -rf $(DESTPREFIX)/$(PRODUCT)
-	mkdir -p $(DESTPREFIX)/$(PRODUCT)/Contents/MacOS
-	mkdir -p $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-	cp -f Info.plist $(DESTPREFIX)/$(PRODUCT)/Contents
-	echo -n "APPL????" > $(DESTPREFIX)/$(PRODUCT)/Contents/PkgInfo
-	cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-	cp -r amber11 $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-	cp -r mopac $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-	cp -r ortep3 $(DESTPREFIX)/$(PRODUCT)/Contents/Resources
-	mkdir -p $(DESTPREFIX)/$(PRODUCT)/Contents/Resources/Scripts/lib
-	for i in $(RUBY_EXTLIB); do cp $(RUBY_DIR)/lib/$$i $(DESTPREFIX)/$(PRODUCT)/Contents/Resources/Scripts/lib; done
-	cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT)/Contents/MacOS
-endif
+$(DESTPREFIX)/$(PRODUCT) : $(DESTPREFIX)/$(EXECUTABLE) ../Scripts/*.rb ../bitmaps/bitmaps amber11 ortep3/ortep3$(EXE_SUFFIX)
 ifeq ($(TARGET_PLATFORM),MSW)
+	echo PWD = $(PWD)
 	rm -rf $(DESTPREFIX)/$(PRODUCT_DIR)
 	mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)
-	cp $(DESTPREFIX)/$(EXECUTABLE) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
-	cp `which mingwm10.dll` $(DESTPREFIX)/$(PRODUCT_DIR)
+	cp $(DESTPREFIX)/$(EXECUTABLE) "$(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)"
+#	cp mingwm10.dll $(DESTPREFIX)/$(PRODUCT_DIR)
 	cp -r ../Scripts $(DESTPREFIX)/$(PRODUCT_DIR)
+	cp -r ../bitmaps/bitmaps $(DESTPREFIX)/$(PRODUCT_DIR)
 	cp -r amber11 $(DESTPREFIX)/$(PRODUCT_DIR)
-	cp -r mopac $(DESTPREFIX)/$(PRODUCT_DIR)
 	cp -r ortep3 $(DESTPREFIX)/$(PRODUCT_DIR)
+	cp -r ../JANPA $(DESTPREFIX)/$(PRODUCT_DIR)
+	cp -r ../Documents/MolbyDoc $(DESTPREFIX)/$(PRODUCT_DIR)
 	mkdir -p $(DESTPREFIX)/$(PRODUCT_DIR)/Scripts/lib
 	for i in $(RUBY_EXTLIB); do cp $(RUBY_DIR)/lib/$$i $(DESTPREFIX)/$(PRODUCT_DIR)/Scripts/lib; done
 endif
 
 ifeq ($(TARGET_PLATFORM),MSW)
-setup: build/release/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
-	/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5/iscc molby.iss
+ifneq ($(DEBUG),1)
+install: setup
+
+setup: $(DESTPREFIX) $(DESTPREFIX)/$(PRODUCT_DIR)/$(FINAL_EXECUTABLE)
+ifneq ($(DEBUG),1)
+	for i in $(DESTPREFIX)/$(PRODUCT_DIR)/*.exe $(DESTPREFIX)/$(PRODUCT_DIR)/amber11/bin/*.exe $(DESTPREFIX)/$(PRODUCT_DIR)/ortep3/*.exe; do $(TOOL_PREFIX)strip "$$i"; done
+endif
+	mkdir -p ../latest_binaries
+ifneq ($(WINE_PATH),)
+	($(WINE_PATH)/wine ../../Inno\ Setup\ 5/ISCC.exe molby$(PRODUCT_SUFFIX).iss || exit 1)
+else
+	(/c/Program\ Files\ \(x86\)/Inno\ Setup\ 5/iscc molby$(PRODUCT_SUFFIX).iss || exit 1)
+endif
+	mv Output/$(SETUP_NAME).exe ../latest_binaries
+	(cd build/release/$(PRODUCT_DIR) && rm -rf $(MAKEDIR)/../latest_binaries/MolbyWin$(PRODUCT_SUFFIX).zip && zip -r $(MAKEDIR)/../latest_binaries/MolbyWin$(PRODUCT_SUFFIX).zip * -x \*.DS_Store \*.svn*)
+endif
 endif
 
 clean: