OSDN -- 開發和下載開源軟體
繁體中文翻譯狀態 translation status for zh-tw

[Ttssh2-commit] [3235] 外部ライブラリを libs フォルダに独立させた

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 3月 25日 (水) 21:54:43 JST 

Revision: 3235
          http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3235
Author:   maya
Date:     2009-03-25 21:54:43 +0900 (Wed, 25 Mar 2009)

Log Message:
-----------
外部ライブラリを libs フォルダに独立させた

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/en/html/reference/develop.txt
    trunk/doc/jp/html/reference/develop.txt
    trunk/teraterm/ttpdlg/svnversion.h
    trunk/teraterm/ttpdlg/ttpdlg.vcproj
    trunk/teraterm/ttpmacro/ttpmacro.vcproj
    trunk/ttssh2/putty/putty.vcproj
    trunk/ttssh2/ttssh.sln
    trunk/ttssh2/ttxssh/ttxssh.vcproj

Added Paths:
-----------
    trunk/libs/
    trunk/libs/buildall.bat
    trunk/libs/buildoniguruma.bat
    trunk/libs/buildopenssl.bat
    trunk/libs/buildzlib.bat
    trunk/libs/oniguruma/
    trunk/libs/openssl/
    trunk/libs/putty/
    trunk/libs/zlib/

Removed Paths:
-------------
    trunk/teraterm/buildoniguruma.bat
    trunk/ttssh2/buildopenssl.bat
    trunk/ttssh2/zlib/


-------------- next part --------------
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/doc/convtext.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -1,6 +1,6 @@
-perl ..\installer\2sjis.pl --i ..\teraterm\oniguruma\doc\RE    --o en\html\reference\RE.txt --c euc-jp --l unix
-perl ..\installer\2sjis.pl --i ..\teraterm\oniguruma\doc\RE.ja --o jp\html\reference\RE.txt --c euc-jp --l unix
-perl ..\installer\2sjis.pl --i ..\ttssh2\openssl\LICENSE  --o en\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
-perl ..\installer\2sjis.pl --i ..\ttssh2\openssl\LICENSE  --o jp\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
-perl ..\installer\2sjis.pl --i ..\ttssh2\putty\LICENCE  --o en\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf
-perl ..\installer\2sjis.pl --i ..\ttssh2\putty\LICENCE  --o jp\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf
+perl ..\installer\2sjis.pl --i ..\libs\oniguruma\doc\RE    --o en\html\reference\RE.txt --c euc-jp --l unix
+perl ..\installer\2sjis.pl --i ..\libs\oniguruma\doc\RE.ja --o jp\html\reference\RE.txt --c euc-jp --l unix
+perl ..\installer\2sjis.pl --i ..\libs\openssl\LICENSE  --o en\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
+perl ..\installer\2sjis.pl --i ..\libs\openssl\LICENSE  --o jp\html\reference\OpenSSL-LICENSE.txt --c euc-jp --l unix
+perl ..\installer\2sjis.pl --i ..\libs\putty\LICENCE  --o en\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf
+perl ..\installer\2sjis.pl --i ..\libs\putty\LICENCE  --o jp\html\reference\PuTTY-LICENSE.txt --c shiftjis --l crlf

Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/doc/en/html/reference/develop.txt	2009-03-25 12:54:43 UTC (rev 3235)
@@ -84,16 +84,16 @@
   And you should use Visual Studio 2005 Standard Edition later version to build Tera Term because Tera Term program links MFC library (Visual Studio 2005 Express Edition can't be used).
 
   1. Checkout Tera Term source code from SourceForge(http://sourceforge.jp/projects/ttssh2/).
-  2. Download 'Oniguruma' source code(http://www.geocities.jp/kosako3/oniguruma/) and extract at 'teraterm\source\oniguruma' directory.
+  2. Download 'Oniguruma' source code(http://www.geocities.jp/kosako3/oniguruma/) and extract into 'libs\oniguruma' directory.
 
        - Automatic procedure of build is following step:
        Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-       Move 'teraterm\source' directory on the command prompt.
+       Move 'libs' directory on the command prompt.
        Run buildoniguruma.bat.
 
        - Manual procedure of build is following step:
        Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-       Move 'teraterm\source\oniguruma' directory on the command prompt.
+       Move 'libs\oniguruma' directory on the command prompt.
        And input the following command lines to build 'Oniguruma' regular expression library(links to onig_s.lib).
        (1) copy win32\Makefile Makefile
        (2) copy win32\config.h config.h
@@ -153,16 +153,17 @@
 
   1. Checkout TTSSH source code from SourceForge(http://sourceforge.jp/projects/ttssh2/).
 
-  2. Extract zlib source code(http://www.zlib.net/) to ttssh2\zlib directory.
-     The build target is 'Release' and TTSSH links to zlib\projects\visualc6\Win32_LIB_Release\zlib.lib (compile option /MT must be specified).
-     The build target is 'Debug' and TTSSH links to  zlib\projects\visualc6\Win32_LIB_Release\zlibd.lib (compile option /MTd must be specified).
+  2. Extract zlib source code(http://www.zlib.net/) into libs\zlib directory.
+      + Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
+      + Move 'lib' directory on the command prompt.
+      + Run buildzlib.bat.
 
-  3. Extract OpenSSL source code(http://www.openssl.org/) to ttssh2\openssl directory.
+  3. Extract OpenSSL source code(http://www.openssl.org/) into libs\openssl directory.
       Build OpenSSL in the following step(Release:TTSSH links to openssl\out32\libeay32.lib, Debug:openssl\out32.dbg\libeay32.lib):
 
       - Build OpenSSL automatically.
       + Launch 'Visual Studio 2005 Command Prompt' batch file from start menu.
-      + Move 'ttssh2' directory on the command prompt.
+      + Move 'libs' directory on the command prompt.
       + Run buildopenssl.bat.
 
       - Build OpenSSL manually.
@@ -181,7 +182,7 @@
           (Now you are back in ttssh2 folder.)
         See the instruction in the OpenSSL documentation for details.
 
-  5. Extract PuTTY source code(http://www.chiark.greenend.org.uk/~sgtatham/putty/) to ttssh2\putty directory.
+  5. Extract PuTTY source code(http://www.chiark.greenend.org.uk/~sgtatham/putty/) into libs\putty directory.
   5. Open ttssh2\ttssh.sln with Visual Studio.
   6. Build TTSSH solution.
   7. TTSSH DLL will be generated in ttssh2\ttxssh directory if the building is successful.

Modified: trunk/doc/jp/html/reference/develop.txt
===================================================================
--- trunk/doc/jp/html/reference/develop.txt	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/doc/jp/html/reference/develop.txt	2009-03-25 12:54:43 UTC (rev 3235)
@@ -90,16 +90,16 @@
   ƒrƒ‹ƒh‚É‚ÍVisual Studio 2005 Standard EditionˆÈã‚ª•K—v‚Å‚·iVisual Studio 2005 Express Edition‚Í•s‰ÂjB
 
   1. ƒ\[ƒXƒR[ƒh‚ðSourceForge(http://sourceforge.jp/projects/ttssh2/)‚©‚çƒ`ƒFƒbƒNƒAƒEƒg‚·‚éB
-  2. Oniguruma‚̃\[ƒXƒR[ƒh(http://www.geocities.jp/kosako3/oniguruma/)‚ð teraterm\source\oniguruma ƒfƒBƒŒƒNƒgƒŠ‚É“WŠJ‚·‚éB
+  2. Oniguruma‚̃\[ƒXƒR[ƒh(http://www.geocities.jp/kosako3/oniguruma/)‚ð libs\oniguruma ƒfƒBƒŒƒNƒgƒŠ‚Ì’†‚É“WŠJ‚·‚éB
 
        - Ž©“®‚ōs‚¤ê‡
        ƒXƒ^[ƒgƒƒjƒ…[‚©‚çuVisual Studio 2005 ƒRƒ}ƒ“ƒh ƒvƒƒ“ƒvƒgv‚ð‹N“®‚·‚éB
-       ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç teraterm\source ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
+       ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç libs ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
        buildoniguruma.bat ‚ðŽÀs‚·‚éB
 
        - Žè“®‚ōs‚¤ê‡
        ƒXƒ^[ƒgƒƒjƒ…[‚©‚çuVisual Studio 2005 ƒRƒ}ƒ“ƒh ƒvƒƒ“ƒvƒgv‚ð‹N“®‚·‚éB
-       ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç teraterm\source\oniguruma ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
+       ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç libs\oniguruma ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
        ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒg‚©‚çˆÈ‰º‚Ì“ü—Í‚ðs‚¢AOniguruma‚ðƒrƒ‹ƒh‚·‚éionig_s.lib‚ªƒŠƒ“ƒN‚³‚ê‚éjB
        (1) copy win32\Makefile Makefile
        (2) copy win32\config.h config.h
@@ -159,16 +159,17 @@
 
   1. ƒ\[ƒXƒR[ƒh‚ðSourceForge(http://sourceforge.jp/projects/ttssh2/)‚©‚çƒ`ƒFƒbƒNƒAƒEƒg‚·‚éB
 
-  2. zlib‚̃\[ƒXƒR[ƒh(http://www.zlib.net/)‚ð ttssh2\zlib ƒfƒBƒŒƒNƒgƒŠ‚É“WŠJ‚·‚éB
-     Release ‚Å‚Í zlib\projects\visualc6\Win32_LIB_Release\zlib.lib ‚ªƒŠƒ“ƒN‚³‚ê‚邱‚Æ‚É‚È‚éiƒRƒ“ƒpƒCƒ‹ƒIƒvƒVƒ‡ƒ“‚É /MT ‚ªŽw’肳‚ê‚Ä‚¢‚邱‚ƁjB
-     Debug ‚Å‚Í zlib\projects\visualc6\Win32_LIB_Release\zlibd.lib ‚ªƒŠƒ“ƒN‚³‚ê‚邱‚Æ‚É‚È‚éiƒRƒ“ƒpƒCƒ‹ƒIƒvƒVƒ‡ƒ“‚É /MTd ‚ªŽw’肳‚ê‚Ä‚¢‚邱‚ƁjB
+  2. zlib‚̃\[ƒXƒR[ƒh(http://www.zlib.net/)‚ð libs\zlib ƒfƒBƒŒƒNƒgƒŠ‚Ì’†‚É“WŠJ‚·‚éB
+      + ƒXƒ^[ƒgƒƒjƒ…[‚©‚çuVisual Studio 2005 ƒRƒ}ƒ“ƒh ƒvƒƒ“ƒvƒgv‚ð‹N“®‚·‚éB
+      + ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç libs ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
+      + buildzlib.bat ‚ðŽÀs‚·‚éB
 
-  3. OpenSSL‚̃\[ƒXƒR[ƒh(http://www.openssl.org/)‚ð ttssh2\openssl ƒfƒBƒŒƒNƒgƒŠ‚É“WŠJ‚·‚éBOpenSSL‚ðƒrƒ‹ƒh‚·‚éiˆÈ‰ºŽQÆjB
+  3. OpenSSL‚̃\[ƒXƒR[ƒh(http://www.openssl.org/)‚ð libs\openssl ƒfƒBƒŒƒNƒgƒŠ‚Ì’†‚É“WŠJ‚·‚éBOpenSSL‚ðƒrƒ‹ƒh‚·‚éiˆÈ‰ºŽQÆjB
      Release ‚Å‚Í openssl\out32\libeay32.lib ‚ªADebug ‚Å‚Í openssl\out32.dbg\libeay32.lib ‚ªƒŠƒ“ƒN‚³‚ê‚邱‚Æ‚É‚È‚éB
 
       - Ž©“®‚ōs‚¤ê‡
       + ƒXƒ^[ƒgƒƒjƒ…[‚©‚çuVisual Studio 2005 ƒRƒ}ƒ“ƒh ƒvƒƒ“ƒvƒgv‚ð‹N“®‚·‚éB
-      + ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç ttssh2 ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
+      + ƒRƒ}ƒ“ƒhƒvƒƒ“ƒvƒgã‚©‚ç libs ƒfƒBƒŒƒNƒgƒŠ‚Ɉړ®‚·‚éB
       + buildopenssl.bat ‚ðŽÀs‚·‚éB
 
       - Žè“®‚ōs‚¤ê‡
@@ -187,7 +188,7 @@
           (ttssh2ƒtƒHƒ‹ƒ_‚É–ß‚è‚Ü‚·B)
         Ú×‚ɂ‚¢‚ẮAOpenSSL‚̃hƒLƒ…ƒƒ“ƒg‚ðŽQÆ‚µ‚Ä‚­‚¾‚³‚¢B
 
-  4. PuTTY‚̃\[ƒXƒR[ƒh(http://www.chiark.greenend.org.uk/~sgtatham/putty/)‚ð ttssh2\putty ƒfƒBƒŒƒNƒgƒŠ‚É“WŠJ‚·‚éB
+  4. PuTTY‚̃\[ƒXƒR[ƒh(http://www.chiark.greenend.org.uk/~sgtatham/putty/)‚ð libs\putty ƒfƒBƒŒƒNƒgƒŠ‚Ì’†‚É“WŠJ‚·‚éB
   5. ttssh2\ttssh.sln ‚ðVisual Studio‚ÅŠJ‚­
   6. ƒ\ƒŠƒ…[ƒVƒ‡ƒ“‚ðƒrƒ‹ƒh‚·‚é
   7. ƒrƒ‹ƒh‚ɐ¬Œ÷‚·‚é‚Ættssh2\ttxssh ƒfƒBƒŒƒNƒgƒŠ‚ÉDLL‚ª¶¬‚³‚ê‚é

Added: trunk/libs/buildall.bat
===================================================================
--- trunk/libs/buildall.bat	                        (rev 0)
+++ trunk/libs/buildall.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -0,0 +1,3 @@
+CALL buildoniguruma.bat
+CALL buildzlib.bat
+CALL buildopenssl.bat

Copied: trunk/libs/buildoniguruma.bat (from rev 3227, trunk/teraterm/buildoniguruma.bat)
===================================================================
--- trunk/libs/buildoniguruma.bat	                        (rev 0)
+++ trunk/libs/buildoniguruma.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -0,0 +1,16 @@
+cd oniguruma
+
+if exist "Makefile" goto build
+
+copy win32\config.h config.h
+perl -e "open(IN,'win32\Makefile');while(<IN>){s|CFLAGS =|CFLAGS = /MT|;print $_;}close(IN);" > Makefile
+perl -e "open(IN,'win32\Makefile');while(<IN>){s|CFLAGS =|CFLAGS = /MTd|;s|libname   = |libname   = debug/|;print $_;}close(IN);" > Makefile.debug
+mkdir debug
+
+:build
+nmake clean
+nmake -f Makefile.debug
+nmake clean
+nmake
+
+cd ..


Property changes on: trunk/libs/buildoniguruma.bat
___________________________________________________________________
Added: svn:mergeinfo
   + 

Copied: trunk/libs/buildopenssl.bat (from rev 3227, trunk/ttssh2/buildopenssl.bat)
===================================================================
--- trunk/libs/buildopenssl.bat	                        (rev 0)
+++ trunk/libs/buildopenssl.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -0,0 +1,27 @@
+cd openssl
+
+if exist "Makefile.bak" goto build
+
+perl Configure VC-WIN32
+
+copy ms\do_ms.bat ms\do_ms.bat.orig
+perl -e "open(IN,'ms\do_ms.bat');while(<IN>){print $_;}print 'perl util\mk1mf.pl no-asm debug VC-WIN32 >ms\ntd.mak';print \"\n\";close(IN);" > ms\do_ms.bat.tmp
+copy /Y ms\do_ms.bat.tmp ms\do_ms.bat
+
+call ms\do_ms.bat
+
+copy ms\nt.mak ms\nt.mak.orig
+perl -e "open(IN,'ms\nt.mak');while(<IN>){s/\/MD/\/MT/;print $_;}close(IN);" > ms\nt.mak.tmp
+copy /Y ms\nt.mak.tmp ms\nt.mak
+del ms\nt.mak.tmp
+
+copy ms\ntd.mak ms\ntd.mak.orig
+perl -e "open(IN,'ms\ntd.mak');while(<IN>){s/\/MD/\/MT/;print $_;}close(IN);" > ms\ntd.mak.tmp
+copy /Y ms\ntd.mak.tmp ms\ntd.mak
+del ms\ntd.mak.tmp
+
+:build
+nmake -f ms\nt.mak
+nmake -f ms\ntd.mak
+
+cd ..


Property changes on: trunk/libs/buildopenssl.bat
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/libs/buildzlib.bat
===================================================================
--- trunk/libs/buildzlib.bat	                        (rev 0)
+++ trunk/libs/buildzlib.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -0,0 +1,22 @@
+cd zlib
+
+if exist "win32\Makefile.msc.rel" goto build
+
+mkdir debug
+mkdir release
+
+perl -e "open(IN,'win32\Makefile.msc');while(<IN>){s/ -MD/ -MT/;print $_;}close(IN);" > win32\Makefile.tmp
+copy /Y win32\Makefile.tmp win32\Makefile.msc.rel
+del win32\Makefile.tmp
+
+perl -e "open(IN,'win32\Makefile.msc');while(<IN>){s/ -MD -O2/ -MTd -Od/;s/ -release/ -debug/;s/ zlib.lib/ zlibd.lib/;s/ zlib.lib/ zlibd.lib/;print $_;}close(IN);" > win32\Makefile.tmp
+copy /Y win32\Makefile.tmp win32\Makefile.msc.deb
+del win32\Makefile.tmp
+
+:build
+nmake -f win32\Makefile.msc.rel clean all
+copy /Y zlib.lib release\
+nmake -f win32\Makefile.msc.deb clean all
+copy /Y zlibd.lib debug\
+
+cd ..

Deleted: trunk/teraterm/buildoniguruma.bat
===================================================================
--- trunk/teraterm/buildoniguruma.bat	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/teraterm/buildoniguruma.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -1,16 +0,0 @@
-cd oniguruma
-
-if exist "Makefile" goto build
-
-copy win32\config.h config.h
-perl -e "open(IN,'win32\Makefile');while(<IN>){s|CFLAGS =|CFLAGS = /MT|;print $_;}close(IN);" > Makefile
-perl -e "open(IN,'win32\Makefile');while(<IN>){s|CFLAGS =|CFLAGS = /MTd|;s|libname   = |libname   = debug/|;print $_;}close(IN);" > Makefile.debug
-mkdir debug
-
-:build
-nmake clean
-nmake -f Makefile.debug
-nmake clean
-nmake
-
-cd ..

Modified: trunk/teraterm/ttpdlg/svnversion.h
===================================================================
--- trunk/teraterm/ttpdlg/svnversion.h	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/teraterm/ttpdlg/svnversion.h	2009-03-25 12:54:43 UTC (rev 3235)
@@ -1,4 +1,4 @@
 /* This file was automatically generated by make_svn_revision.pl. 
  * Don't modify this file.
  */
-#define SVNVERSION	3232
+#define SVNVERSION	3234

Modified: trunk/teraterm/ttpdlg/ttpdlg.vcproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.vcproj	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/teraterm/ttpdlg/ttpdlg.vcproj	2009-03-25 12:54:43 UTC (rev 3235)
@@ -49,7 +49,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\oniguruma; ..\common"
+				AdditionalIncludeDirectories="..\..\libs\oniguruma; ..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -81,7 +81,7 @@
 				OutputFile="..\Release/ttpdlg.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\oniguruma;..\release"
+				AdditionalLibraryDirectories="..\..\libs\oniguruma;..\release"
 				ModuleDefinitionFile=".\ttpdlg.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\Release/ttpdlg.pdb"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\oniguruma;..\common"
+				AdditionalIncludeDirectories="..\..\libs\oniguruma;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -179,7 +179,7 @@
 				OutputFile="..\Debug/ttpdlg.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\oniguruma\debug;..\debug"
+				AdditionalLibraryDirectories="..\..\libs\oniguruma\debug;..\debug"
 				ModuleDefinitionFile=".\ttpdlg.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\Debug/ttpdlg.pdb"

Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj	2009-03-25 12:54:43 UTC (rev 3235)
@@ -50,7 +50,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;&#x0D;&#x0A;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\oniguruma;..\common"
+				AdditionalIncludeDirectories="..\..\libs\oniguruma;..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -83,7 +83,7 @@
 				OutputFile="..\Release/ttpmacro.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\oniguruma;..\release"
+				AdditionalLibraryDirectories="..\..\libs\oniguruma;..\release"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\Release/ttpmacro.pdb"
 				SubSystem="2"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\oniguruma;..\common"
+				AdditionalIncludeDirectories="..\..\libs\oniguruma;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -180,7 +180,7 @@
 				OutputFile="..\Debug/ttpmacro.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\oniguruma\debug;..\debug"
+				AdditionalLibraryDirectories="..\..\libs\oniguruma\debug;..\debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\Debug/ttpmacro.pdb"
 				SubSystem="2"

Deleted: trunk/ttssh2/buildopenssl.bat
===================================================================
--- trunk/ttssh2/buildopenssl.bat	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/ttssh2/buildopenssl.bat	2009-03-25 12:54:43 UTC (rev 3235)
@@ -1,27 +0,0 @@
-cd openssl
-
-if exist "Makefile.bak" goto build
-
-perl Configure VC-WIN32
-
-copy ms\do_ms.bat ms\do_ms.bat.orig
-perl -e "open(IN,'ms\do_ms.bat');while(<IN>){print $_;}print 'perl util\mk1mf.pl no-asm debug VC-WIN32 >ms\ntd.mak';print \"\n\";close(IN);" > ms\do_ms.bat.tmp
-copy /Y ms\do_ms.bat.tmp ms\do_ms.bat
-
-call ms\do_ms.bat
-
-copy ms\nt.mak ms\nt.mak.orig
-perl -e "open(IN,'ms\nt.mak');while(<IN>){s/\/MD/\/MT/;print $_;}close(IN);" > ms\nt.mak.tmp
-copy /Y ms\nt.mak.tmp ms\nt.mak
-del ms\nt.mak.tmp
-
-copy ms\ntd.mak ms\ntd.mak.orig
-perl -e "open(IN,'ms\ntd.mak');while(<IN>){s/\/MD/\/MT/;print $_;}close(IN);" > ms\ntd.mak.tmp
-copy /Y ms\ntd.mak.tmp ms\ntd.mak
-del ms\ntd.mak.tmp
-
-:build
-nmake -f ms\nt.mak
-nmake -f ms\ntd.mak
-
-cd ..

Modified: trunk/ttssh2/putty/putty.vcproj
===================================================================
--- trunk/ttssh2/putty/putty.vcproj	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/ttssh2/putty/putty.vcproj	2009-03-25 12:54:43 UTC (rev 3235)
@@ -39,8 +39,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\windows;.\"
-				PreprocessorDefinitions="_WINDOWS"
+				AdditionalIncludeDirectories="..\..\libs\putty;..\..\libs\putty\windows"
+				PreprocessorDefinitions="_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -101,8 +101,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\windows;.\"
-				PreprocessorDefinitions="_WINDOWS"
+				AdditionalIncludeDirectories="..\..\libs\putty;..\..\libs\putty\windows"
+				PreprocessorDefinitions="_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -144,55 +144,55 @@
 			Name="Putty Files"
 			>
 			<File
-				RelativePath=".\INT64.H"
+				RelativePath="..\..\libs\putty\INT64.H"
 				>
 			</File>
 			<File
-				RelativePath=".\MISC.C"
+				RelativePath="..\..\libs\putty\MISC.C"
 				>
 			</File>
 			<File
-				RelativePath=".\MISC.H"
+				RelativePath="..\..\libs\putty\MISC.H"
 				>
 			</File>
 			<File
-				RelativePath=".\NETWORK.H"
+				RelativePath="..\..\libs\putty\NETWORK.H"
 				>
 			</File>
 			<File
-				RelativePath=".\PUTTY.H"
+				RelativePath="..\..\libs\putty\PUTTY.H"
 				>
 			</File>
 			<File
-				RelativePath=".\PUTTYMEM.H"
+				RelativePath="..\..\libs\putty\PUTTYMEM.H"
 				>
 			</File>
 			<File
-				RelativePath=".\puttyps.h"
+				RelativePath="..\..\libs\putty\puttyps.h"
 				>
 			</File>
 			<File
-				RelativePath=".\SSH.H"
+				RelativePath="..\..\libs\putty\SSH.H"
 				>
 			</File>
 			<File
-				RelativePath=".\SSHBN.C"
+				RelativePath="..\..\libs\putty\SSHBN.C"
 				>
 			</File>
 			<File
-				RelativePath=".\TREE234.H"
+				RelativePath="..\..\libs\putty\TREE234.H"
 				>
 			</File>
 			<File
-				RelativePath=".\WINDOWS\WINHELP.H"
+				RelativePath="..\..\libs\putty\WINDOWS\WINHELP.H"
 				>
 			</File>
 			<File
-				RelativePath=".\WINDOWS\WINPGNTC.C"
+				RelativePath="..\..\libs\putty\WINDOWS\WINPGNTC.C"
 				>
 			</File>
 			<File
-				RelativePath=".\WINDOWS\WINSTUFF.H"
+				RelativePath="..\..\libs\putty\WINDOWS\WINSTUFF.H"
 				>
 			</File>
 		</Filter>

Modified: trunk/ttssh2/ttssh.sln
===================================================================
--- trunk/ttssh2/ttssh.sln	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/ttssh2/ttssh.sln	2009-03-25 12:54:43 UTC (rev 3235)
@@ -7,11 +7,8 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttxssh", "ttxssh\ttxssh.vcproj", "{5638BB89-44E3-4D55-BA98-A01142B4223E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{98CA1284-8F6C-4791-BF57-7E5FAD33744E} = {98CA1284-8F6C-4791-BF57-7E5FAD33744E}
-		{8514EAB3-989A-4A81-81C7-04A26834C615} = {8514EAB3-989A-4A81-81C7-04A26834C615}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\projects\visualc6\zlib.vcproj", "{8514EAB3-989A-4A81-81C7-04A26834C615}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "putty", "putty\putty.vcproj", "{98CA1284-8F6C-4791-BF57-7E5FAD33744E}"
 EndProject
 Global
@@ -32,10 +29,6 @@
 		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Debug|Win32.Build.0 = Debug|Win32
 		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.ActiveCfg = Release|Win32
 		{5638BB89-44E3-4D55-BA98-A01142B4223E}.Release|Win32.Build.0 = Release|Win32
-		{8514EAB3-989A-4A81-81C7-04A26834C615}.Debug|Win32.ActiveCfg = LIB Debug|Win32
-		{8514EAB3-989A-4A81-81C7-04A26834C615}.Debug|Win32.Build.0 = LIB Debug|Win32
-		{8514EAB3-989A-4A81-81C7-04A26834C615}.Release|Win32.ActiveCfg = LIB Release|Win32
-		{8514EAB3-989A-4A81-81C7-04A26834C615}.Release|Win32.Build.0 = LIB Release|Win32
 		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Debug|Win32.Build.0 = Debug|Win32
 		{98CA1284-8F6C-4791-BF57-7E5FAD33744E}.Release|Win32.ActiveCfg = Release|Win32

Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj	2009-03-25 12:11:21 UTC (rev 3234)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj	2009-03-25 12:54:43 UTC (rev 3235)
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;&#x0D;&#x0A;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\teraterm\common;..\openssl\inc32;..\..\teraterm\teraterm;..\zlib;..\matcher;..\putty"
+				AdditionalIncludeDirectories="..\..\teraterm\common;..\..\libs\openssl\inc32;..\..\teraterm\teraterm;..\..\libs\zlib;..\matcher;..\putty"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC"
 				RuntimeLibrary="1"
 				EnableFunctionLevelLinking="true"
@@ -78,10 +78,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="Version.lib &#x0D;&#x0A;&#x0D;&#x0A;"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib ..\openssl\out32.dbg\libeay32.lib ..\zlib\projects\visualc6\Win32_LIB_Debug\zlibd.lib ..\..\teraterm\Debug\ttpcmn.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlibd.lib ttpcmn.lib"
 				OutputFile=".\Debug/ttxssh.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\libs\openssl\out32.dbg;..\..\libs\zlib\debug;..\..\teraterm\Debug"
 				ModuleDefinitionFile="ttxssh.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/ttxssh.pdb"
@@ -151,7 +152,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot; &#x0D;&#x0A;"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="..\..\teraterm\common;..\openssl\inc32;..\..\teraterm\teraterm;..\zlib;..\matcher;..\putty"
+				AdditionalIncludeDirectories="..\..\teraterm\common;..\..\libs\openssl\inc32;..\..\teraterm\teraterm;..\..\libs\zlib;..\matcher;..\putty"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -181,10 +182,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="Version.lib &#x0D;&#x0A;"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib ..\openssl\out32\libeay32.lib ..\zlib\projects\visualc6\Win32_LIB_Release\zlib.lib ..\..\teraterm\Release\ttpcmn.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlib.lib ttpcmn.lib"
 				OutputFile=".\Release/ttxssh.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\libs\openssl\out32;..\..\libs\zlib\release;..\..\teraterm\Release"
 				ModuleDefinitionFile="ttxssh.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/ttxssh.pdb"


Ttssh2-commit メーリングリストの案内
Back to archive index