Tera TermRevision: 9777
https://osdn.net/projects/ttssh2/scm/svn/commits/9777
Author: zmatsuo
Date: 2022-02-24 01:42:57 +0900 (Thu, 24 Feb 2022)
Log Message:
-----------
cyglaunch を cygterm+.tar.gz に加えるようにした
- 次の場合を考慮
- Tera Termのソースツリーでビルドした場合
- cygterm+.tar.gzからビルドした場合
Modified Paths:
--------------
branches/cygterm/cygwin/cygterm/Makefile
-------------- next part --------------
Modified: branches/cygterm/cygwin/cygterm/Makefile
===================================================================
--- branches/cygterm/cygwin/cygterm/Makefile 2022-02-23 16:42:46 UTC (rev 9776)
+++ branches/cygterm/cygwin/cygterm/Makefile 2022-02-23 16:42:57 UTC (rev 9777)
@@ -39,6 +39,16 @@
SRC_RC = cygterm.rc
ARCHIVE = cygterm+.tar.gz
+ifneq (,$(wildcard ../Release/cyglaunch.exe))
+CYGLAUNCH_DIR = ../Release
+else
+ifneq (,$(wildcard ./cyglaunch.exe))
+CYGLAUNCH_DIR = .
+else
+CYGLAUNCH_DIR =
+endif
+endif
+
.PHONY: all clean install uninstall cygterm_x86_64 cygterm_i686
all : $(EXE)
@@ -69,7 +79,11 @@
rm -f $(BINDIR)/$(CFG)
$(ARCHIVE) : $(SRC) $(ICO) $(CFG) README README-j Makefile CMakeLists.txt
- tar cf - $(SRC) $(ICO) $(CFG) COPYING README README-j Makefile CMakeLists.txt msys2term.cfg | gzip > $(ARCHIVE)
+ifeq (,$(CYGLAUNCH_DIR))
+ tar cf - $(SRC) $(ICO) $(CFG) COPYING README README-j Makefile CMakeLists.txt msys2term.cfg $(CYGLAUNCH) | gzip > $(ARCHIVE)
+else
+ tar cf - $(SRC) $(ICO) $(CFG) COPYING README README-j Makefile CMakeLists.txt msys2term.cfg -C $(CYGLAUNCH_DIR) cyglaunch.exe | gzip > $(ARCHIVE)
+endif
cygterm.o:
ifeq (0, $(shell nm /usr/lib/crt0.o | grep -c WinMainCRTStartup))