Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use arch suffix consistently in all directories names

Browse Source 
For some reason, we used "vc_x64_lib" as the output directory for the
libraries, but "vc_mswu_x64" as the output directory for the samples.

Place the arch suffix, i.e. "_x64" part, always after the compiler
prefix (possibly including version), for consistency with both the
library output directories and with MSBuild project files, as
build/msw/wx_setup.props uses $(wxCompilerPrefix)$(wxArchSuffix)_...
as wxIntRootDir value.
This commit is contained in:
Vadim Zeitlin
2021-08-26 23:12:40 +02:00
parent 91ae4e2f8a
commit 5216d97f08
417 changed files with 7779 additions and 7779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
samples/html/helpview/helpview_vc8.vcproj
View File

@@ -412,8 +412,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="vc_mswud_x64"
IntermediateDirectory="vc_mswud_x64\helpview"
OutputDirectory="vc_x64_mswud"
IntermediateDirectory="vc_x64_mswud\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -447,8 +447,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswud_x64\helpview\"
ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
ObjectFile="vc_x64_mswud\helpview\"
ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -470,13 +470,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswud_x64\helpview.exe"
OutputFile="vc_x64_mswud\helpview.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -491,7 +491,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswud_x64\helpview_vc8.bsc"
OutputFile="vc_x64_mswud\helpview_vc8.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -509,8 +509,8 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="vc_mswu_x64"
IntermediateDirectory="vc_mswu_x64\helpview"
OutputDirectory="vc_x64_mswu"
IntermediateDirectory="vc_x64_mswu\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -541,8 +541,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswu_x64\helpview\"
ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
ObjectFile="vc_x64_mswu\helpview\"
ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -564,13 +564,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswu_x64\helpview.exe"
OutputFile="vc_x64_mswu\helpview.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -587,7 +587,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswu_x64\helpview_vc8.bsc"
OutputFile="vc_x64_mswu\helpview_vc8.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -605,8 +605,8 @@
</Configuration>
<Configuration
Name="DLL Debug|x64"
OutputDirectory="vc_mswuddll_x64"
IntermediateDirectory="vc_mswuddll_x64\helpview"
OutputDirectory="vc_x64_mswuddll"
IntermediateDirectory="vc_x64_mswuddll\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -640,8 +640,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\helpview\"
ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
ObjectFile="vc_x64_mswuddll\helpview\"
ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -663,13 +663,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\helpview.exe"
OutputFile="vc_x64_mswuddll\helpview.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -684,7 +684,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswuddll_x64\helpview_vc8.bsc"
OutputFile="vc_x64_mswuddll\helpview_vc8.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -702,8 +702,8 @@
</Configuration>
<Configuration
Name="DLL Release|x64"
OutputDirectory="vc_mswudll_x64"
IntermediateDirectory="vc_mswudll_x64\helpview"
OutputDirectory="vc_x64_mswudll"
IntermediateDirectory="vc_x64_mswudll\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -734,8 +734,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\helpview\"
ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
ObjectFile="vc_x64_mswudll\helpview\"
ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true"
@@ -757,13 +757,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswudll_x64\helpview.exe"
OutputFile="vc_x64_mswudll\helpview.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -780,7 +780,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswudll_x64\helpview_vc8.bsc"
OutputFile="vc_x64_mswudll\helpview_vc8.bsc"
SuppressStartupBanner="true"
/>
<Tool

56
samples/html/helpview/helpview_vc9.vcproj
View File

@@ -398,8 +398,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="vc_mswud_x64"
IntermediateDirectory="vc_mswud_x64\helpview"
OutputDirectory="vc_x64_mswud"
IntermediateDirectory="vc_x64_mswud\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswud_x64\helpview\"
ProgramDataBaseFileName="vc_mswud_x64\helpview.pdb"
ObjectFile="vc_x64_mswud\helpview\"
ProgramDataBaseFileName="vc_x64_mswud\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -455,13 +455,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswud_x64\helpview.exe"
OutputFile="vc_x64_mswud\helpview.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswud\helpview.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -476,7 +476,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswud_x64\helpview_vc9.bsc"
OutputFile="vc_x64_mswud\helpview_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -491,8 +491,8 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="vc_mswu_x64"
IntermediateDirectory="vc_mswu_x64\helpview"
OutputDirectory="vc_x64_mswu"
IntermediateDirectory="vc_x64_mswu\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswu_x64\helpview\"
ProgramDataBaseFileName="vc_mswu_x64\helpview.pdb"
ObjectFile="vc_x64_mswu\helpview\"
ProgramDataBaseFileName="vc_x64_mswu\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -546,13 +546,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswu_x64\helpview.exe"
OutputFile="vc_x64_mswu\helpview.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswu\helpview.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -569,7 +569,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswu_x64\helpview_vc9.bsc"
OutputFile="vc_x64_mswu\helpview_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -584,8 +584,8 @@
</Configuration>
<Configuration
Name="DLL Debug|x64"
OutputDirectory="vc_mswuddll_x64"
IntermediateDirectory="vc_mswuddll_x64\helpview"
OutputDirectory="vc_x64_mswuddll"
IntermediateDirectory="vc_x64_mswuddll\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\helpview\"
ProgramDataBaseFileName="vc_mswuddll_x64\helpview.pdb"
ObjectFile="vc_x64_mswuddll\helpview\"
ProgramDataBaseFileName="vc_x64_mswuddll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -641,13 +641,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_html.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\helpview.exe"
OutputFile="vc_x64_mswuddll\helpview.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswuddll\helpview.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -662,7 +662,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswuddll_x64\helpview_vc9.bsc"
OutputFile="vc_x64_mswuddll\helpview_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -677,8 +677,8 @@
</Configuration>
<Configuration
Name="DLL Release|x64"
OutputDirectory="vc_mswudll_x64"
IntermediateDirectory="vc_mswudll_x64\helpview"
OutputDirectory="vc_x64_mswudll"
IntermediateDirectory="vc_x64_mswudll\helpview"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\helpview\"
ProgramDataBaseFileName="vc_mswudll_x64\helpview.pdb"
ObjectFile="vc_x64_mswudll\helpview\"
ProgramDataBaseFileName="vc_x64_mswudll\helpview.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -732,13 +732,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_html.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib"
OutputFile="vc_mswudll_x64\helpview.exe"
OutputFile="vc_x64_mswudll\helpview.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\helpview.pdb"
ProgramDatabaseFile="vc_x64_mswudll\helpview.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswudll_x64\helpview_vc9.bsc"
OutputFile="vc_x64_mswudll\helpview_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool

2
samples/html/helpview/makefile.vc
View File

@@ -15,7 +15,7 @@
WX_RELEASE_NODOT = 31
COMPILER_PREFIX = vc
OBJS = \
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX)
$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = \
.\..\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \