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/opengl/cube/cube_vc9.vcproj
View File

@@ -398,8 +398,8 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="vc_mswud_x64"
IntermediateDirectory="vc_mswud_x64\cube"
OutputDirectory="vc_x64_mswud"
IntermediateDirectory="vc_x64_mswud\cube"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -433,8 +433,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswud_x64\cube\"
ProgramDataBaseFileName="vc_mswud_x64\cube.pdb"
ObjectFile="vc_x64_mswud\cube\"
ProgramDataBaseFileName="vc_x64_mswud\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -455,13 +455,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.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\cube.exe"
OutputFile="vc_x64_mswud\cube.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud_x64\cube.pdb"
ProgramDatabaseFile="vc_x64_mswud\cube.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -476,7 +476,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswud_x64\cube_vc9.bsc"
OutputFile="vc_x64_mswud\cube_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -491,8 +491,8 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="vc_mswu_x64"
IntermediateDirectory="vc_mswu_x64\cube"
OutputDirectory="vc_x64_mswu"
IntermediateDirectory="vc_x64_mswu\cube"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -524,8 +524,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswu_x64\cube\"
ProgramDataBaseFileName="vc_mswu_x64\cube.pdb"
ObjectFile="vc_x64_mswu\cube\"
ProgramDataBaseFileName="vc_x64_mswu\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -546,13 +546,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.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\cube.exe"
OutputFile="vc_x64_mswu\cube.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu_x64\cube.pdb"
ProgramDatabaseFile="vc_x64_mswu\cube.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -569,7 +569,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswu_x64\cube_vc9.bsc"
OutputFile="vc_x64_mswu\cube_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -584,8 +584,8 @@
</Configuration>
<Configuration
Name="DLL Debug|x64"
OutputDirectory="vc_mswuddll_x64"
IntermediateDirectory="vc_mswuddll_x64\cube"
OutputDirectory="vc_x64_mswuddll"
IntermediateDirectory="vc_x64_mswuddll\cube"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -619,8 +619,8 @@
RuntimeLibrary="3"
BufferSecurityCheck="true"
RuntimeTypeInfo="true"
ObjectFile="vc_mswuddll_x64\cube\"
ProgramDataBaseFileName="vc_mswuddll_x64\cube.pdb"
ObjectFile="vc_x64_mswuddll\cube\"
ProgramDataBaseFileName="vc_x64_mswuddll\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -641,13 +641,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_gl.lib opengl32.lib glu32.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\cube.exe"
OutputFile="vc_x64_mswuddll\cube.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswuddll_x64\cube.pdb"
ProgramDatabaseFile="vc_x64_mswuddll\cube.pdb"
SubSystem="2"
TargetMachine="17"
/>
@@ -662,7 +662,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswuddll_x64\cube_vc9.bsc"
OutputFile="vc_x64_mswuddll\cube_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool
@@ -677,8 +677,8 @@
</Configuration>
<Configuration
Name="DLL Release|x64"
OutputDirectory="vc_mswudll_x64"
IntermediateDirectory="vc_mswudll_x64\cube"
OutputDirectory="vc_x64_mswudll"
IntermediateDirectory="vc_x64_mswudll\cube"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -710,8 +710,8 @@
ExceptionHandling="1"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
ObjectFile="vc_mswudll_x64\cube\"
ProgramDataBaseFileName="vc_mswudll_x64\cube.pdb"
ObjectFile="vc_x64_mswudll\cube\"
ProgramDataBaseFileName="vc_x64_mswudll\cube.pdb"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -732,13 +732,13 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw31u_gl.lib opengl32.lib glu32.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\cube.exe"
OutputFile="vc_x64_mswudll\cube.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\..\..\lib\vc_x64_dll"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll_x64\cube.pdb"
ProgramDatabaseFile="vc_x64_mswudll\cube.pdb"
SubSystem="2"
TargetMachine="17"
OptimizeReferences="2"
@@ -755,7 +755,7 @@
/>
<Tool
Name="VCBscMakeTool"
OutputFile="vc_mswudll_x64\cube_vc9.bsc"
OutputFile="vc_x64_mswudll\cube_vc9.bsc"
SuppressStartupBanner="true"
/>
<Tool