svnno****@sourc*****
svnno****@sourc*****
2009年 3月 28日 (土) 20:57:23 JST
Tera TermRevision: 3255
http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3255
Author: maya
Date: 2009-03-28 20:57:23 +0900 (Sat, 28 Mar 2009)
Log Message:
-----------
ライブラリの出力先やファイル名を変更
Modified Paths:
--------------
trunk/libs/buildoniguruma.bat
trunk/libs/buildzlib.bat
trunk/teraterm/ttpdlg/ttpdlg.vcproj
trunk/teraterm/ttpmacro/ttpmacro.vcproj
trunk/ttssh2/ttxssh/ttxssh.vcproj
-------------- next part --------------
Modified: trunk/libs/buildoniguruma.bat
===================================================================
--- trunk/libs/buildoniguruma.bat 2009-03-28 11:55:25 UTC (rev 3254)
+++ trunk/libs/buildoniguruma.bat 2009-03-28 11:57:23 UTC (rev 3255)
@@ -4,13 +4,17 @@
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
+perl -e "open(IN,'win32\Makefile');while(<IN>){s|CFLAGS = -O2|CFLAGS = /MTd -Od|;s|_s.lib|_sd.lib|;print $_;}close(IN);" > Makefile.debug
:build
-nmake clean
+if exist onig_sd.lib goto build_release
+nmake -f Makefile.debug clean
nmake -f Makefile.debug
+move onig_sd.lib sample\
nmake clean
+move sample\onig_sd.lib .\
+
+:build_release
nmake
cd ..
Modified: trunk/libs/buildzlib.bat
===================================================================
--- trunk/libs/buildzlib.bat 2009-03-28 11:55:25 UTC (rev 3254)
+++ trunk/libs/buildzlib.bat 2009-03-28 11:57:23 UTC (rev 3255)
@@ -1,22 +1,20 @@
cd zlib
-if exist "win32\Makefile.msc.rel" goto build
+if exist "win32\Makefile.msc.release" goto build
-mkdir debug
-mkdir release
+perl -e "open(IN,'win32\Makefile.msc');while(<IN>){s/ -MD/ -MT/;print $_;}close(IN);" > win32\Makefile.msc.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.msc.debug
-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\
+if exist zlibd.lib goto build_release
+nmake -f win32\Makefile.msc.debug clean
+nmake -f win32\Makefile.msc.debug
+move zlibd.lib examples\
+nmake -f win32\Makefile.msc.release clean
+move examples\zlibd.lib .\
+:build_release
+nmake -f win32\Makefile.msc.release
+
cd ..
Modified: trunk/teraterm/ttpdlg/ttpdlg.vcproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.vcproj 2009-03-28 11:55:25 UTC (rev 3254)
+++ trunk/teraterm/ttpdlg/ttpdlg.vcproj 2009-03-28 11:57:23 UTC (rev 3255)
@@ -177,11 +177,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Version.lib onig_s.lib ttpcmn.lib"
+ AdditionalDependencies="Version.lib onig_sd.lib ttpcmn.lib"
OutputFile="..\Debug/ttpdlg.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\oniguruma\debug;..\debug"
+ AdditionalLibraryDirectories="..\..\libs\oniguruma;..\debug"
ModuleDefinitionFile=".\ttpdlg.def"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\Debug/ttpdlg.pdb"
Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj 2009-03-28 11:55:25 UTC (rev 3254)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj 2009-03-28 11:57:23 UTC (rev 3255)
@@ -176,11 +176,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib Version.lib"
+ AdditionalDependencies="onig_sd.lib Version.lib"
OutputFile="..\Debug/ttpmacro.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\oniguruma\debug;..\debug"
+ AdditionalLibraryDirectories="..\..\libs\oniguruma;..\debug"
GenerateDebugInformation="true"
ProgramDatabaseFile="..\Debug/ttpmacro.pdb"
SubSystem="2"
Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj 2009-03-28 11:55:25 UTC (rev 3254)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2009-03-28 11:57:23 UTC (rev 3255)
@@ -82,7 +82,7 @@
OutputFile=".\Debug/ttxssh.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\openssl\out32.dbg;..\..\libs\zlib\debug;..\..\teraterm\Debug"
+ AdditionalLibraryDirectories="..\..\libs\openssl\out32.dbg;..\..\libs\zlib;..\..\teraterm\Debug"
ModuleDefinitionFile="ttxssh.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/ttxssh.pdb"
@@ -186,7 +186,7 @@
OutputFile=".\Release/ttxssh.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\openssl\out32;..\..\libs\zlib\release;..\..\teraterm\Release"
+ AdditionalLibraryDirectories="..\..\libs\openssl\out32;..\..\libs\zlib;..\..\teraterm\Release"
ModuleDefinitionFile="ttxssh.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/ttxssh.pdb"