sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Building libraries to intermediate object folder to allow parallel development in multiple versions of C++ Builder

Browse Source 
Source commit: f049c8cfd52b10ca60efa6359ee0bc4e217ebca5
This commit is contained in:
Martin Prikryl
2022-01-21 19:09:33 +00:00
parent 7ae3432834
commit 0aa999a19b
7 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/buildlibs.bat vendored
View File

@@ -1,11 +1,13 @@
@echo off
if "%BUILDTOOLS%" == "" echo BUILDTOOLS not set & exit
if not exist lib mkdir lib
set LIB_PATH=%INTERM_PATH%\Win32
if not exist %LIB_PATH% mkdir %LIB_PATH%
rem ==== OpenSSL ====
if exist lib\libeay32.lib (
if exist %LIB_PATH%\libeay32.lib (
echo OpenSSL already built
goto SKIP_OPENSSL
)
@@ -15,7 +17,7 @@ cd openssl
make
cd ..
if not exist lib\libeay32.lib (
if not exist %LIB_PATH%\libeay32.lib (
echo OpenSSL build failed
exit
)
@@ -24,7 +26,7 @@ exit
rem ==== Expat ====
if exist lib\libexpats_mtd.lib (
if exist %LIB_PATH%\libexpats_mtd.lib (
echo Expat already built
goto SKIP_EXPAT
)
@@ -39,13 +41,13 @@ echo Expat build failed
exit
)
copy expat\bcb5\release\libexpats_mtd.lib lib
copy expat\bcb5\release\libexpats_mtd.lib %LIB_PATH%
:SKIP_EXPAT
rem ==== neon ====
if exist lib\neon.lib (
if exist %LIB_PATH%\neon.lib (
echo neon already built
goto SKIP_NEON
)
@@ -55,7 +57,7 @@ cd neon
make -f Makefile.bcb all
cd ..
if not exist lib\neon.lib (
if not exist %LIB_PATH%\neon.lib (
echo neon build failed
exit
)
@@ -64,7 +66,7 @@ exit
rem ==== PuTTY VS ====
if exist lib\PuTTYVS.lib (
if exist %LIB_PATH%\PuTTYVS.lib (
echo PuTTYVS already built
goto SKIP_PUTTYVS
)
@@ -74,7 +76,7 @@ cd puttyvs
call build.bat
cd ..
if not exist lib\PuTTYVS.lib (
if not exist %LIB_PATH%\PuTTYVS.lib (
echo PuTTYVS build failed
exit
)
@@ -83,7 +85,7 @@ exit
rem ==== libs3 ====
if exist lib\libs3.lib (
if exist %LIB_PATH%\libs3.lib (
echo libs3 already built
goto SKIP_LIBS3
)
@@ -93,7 +95,7 @@ cd libs3
make all
cd ..
if not exist lib\libs3.lib (
if not exist %LIB_PATH%\libs3.lib (
echo libs3 build failed
exit
)
@@ -102,7 +104,7 @@ exit
rem ==== MFC ====
if exist lib\UafxcW.lib (
if exist %LIB_PATH%\UafxcW.lib (
echo MFC already built
goto SKIP_MFC
)
@@ -112,7 +114,7 @@ cd mfc\source
make -fborland.mak NO_WARNINGS=1
cd ..\..
if not exist lib\UafxcW.lib (
if not exist %LIB_PATH%\UafxcW.lib (
echo MFC build failed
exit
)

2
libs/libs3/Makefile
View File

@@ -3,7 +3,7 @@ CFLAG=-DWIN32 -DWIN32_LEAN_AND_MEAN -DWINSCP -DNE_LFS -q-c -tWC -tWM -P
CFLAG = $(CFLAG) -w-aus -w-par
# The output directory for everything interesting
OUT_D=..\lib
OUT_D=$(LIB_PATH)
# The output directory for all the temporary muck
TMP_D=tmp

2
libs/mfc/source/borland.mak
View File

@@ -107,7 +107,7 @@ CG=0
# Lib directory
!ifndef LIBDIR
LIBDIR=..\..\LIB
LIBDIR=$(LIB_PATH)
!endif
# Lib Path

2
libs/neon/Makefile.bcb
View File

@@ -11,7 +11,7 @@ LIB_CFLAG=$(OPENSSL_CFLAG) $(EXPAT_CFLAG1) $(EXPAT_CFLAG2)
SRC_D=.
# The output directory for everything intersting
OUT_D=..\lib
OUT_D=$(LIB_PATH)
# The output directory for all the temporary muck
TMP_D=tmp

2
libs/openssl/Makefile
View File

@@ -29,7 +29,7 @@ LIB_CFLAG=
SRC_D=.
# The output directory for everything intersting
OUT_D=..\lib
OUT_D=$(LIB_PATH)
# The output directory for all the temporary muck
TMP_D=tmp
INCO_D=openssl

2
libs/puttyvs/build.bat
View File

@@ -1,6 +1,6 @@
@echo off
set COFF_LIB=Release\PuTTYVS.lib
set OMF_LIB=..\lib\PuTTYVS.lib
set OMF_LIB=%LIB_PATH%\PuTTYVS.lib
if exist %COFF_LIB% del %COFF_LIB%
if exist %OMF_LIB% del %OMF_LIB%

10
source/WinSCP.cbproj
View File

@@ -64,7 +64,7 @@
<FinalOutputDir>$(FINAL_PATH)\$(Platform)\$(Config)</FinalOutputDir>
<Icon_MainIcon>resource\Application.ico</Icon_MainIcon>
<ILINK_GenerateDRC>true</ILINK_GenerateDRC>
<ILINK_LibraryPath>windows\;forms\;packages\filemng;packages\tbx;packages\png;..\libs\lib;$(LIB_PATH);$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_LibraryPath>windows\;forms\;packages\filemng;packages\tbx;packages\png;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_MapFileType>DetailedSegments</ILINK_MapFileType>
<IncludePath>console;windows\;forms\;core;resource;components;dragext;packages\filemng;packages\dragndrop;packages\my;packages\tb2k;packages\tbx;packages\png;packages\jcl;..\libs\mfc\include;$(BDS)\include\windows;$(BDS)\include\windows\sdk;$(BDS)\include\windows\vcl;$(IncludePath)</IncludePath>
<IntermediateOutputDir>$(INTERM_PATH)\$(Platform)\$(Config)</IntermediateOutputDir>
@@ -106,21 +106,21 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
<ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Debug\;$(BDS)\lib\Win32\Debug\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Debug\;$(INTERM_PATH)\Win32\;$(BDS)\lib\Win32\Debug\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<LinkPackageStatics>vcl.lib;rtl.lib;vclx.lib;ws2_32.lib;secur32.lib;My.lib;DriveDir.lib;DragDropP.lib;tb2k.lib;tbxp.lib;bcbie.lib;Crypt32.lib;PngComponents.lib;xmlrtl.lib;vclactnband.lib;vclimg.lib;winhttp.lib;jcl.lib;vclie.lib;urlmon.lib;shlwapi.lib;powrprof.lib;soaprtl.lib;fmx.lib;dbrtl.lib;inet.lib;psapi.lib</LinkPackageStatics>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Debug\;$(BDS)\lib\Win64\Debug\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Debug\;$(INTERM_PATH)\Win64\;$(BDS)\lib\Win64\Debug\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<Defines>NDEBUG;$(Defines)</Defines>
<TASM_Debugging>None</TASM_Debugging>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Release\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_LibraryPath>$(INTERM_PATH)\Win32\Release\;$(INTERM_PATH)\Win32\;$(BDS)\lib\Win32\Release\;$(BDS)\lib\Win32\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Release\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
<ILINK_LibraryPath>$(INTERM_PATH)\Win64\Release\;$(INTERM_PATH)\Win64\;$(BDS)\lib\Win64\Release\;$(BDS)\lib\Win64\Release\psdk\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
</PropertyGroup>
<ItemGroup>
<CppCompile Include="forms\CustomScpExplorer.cpp">