Skip to content

Commit 122c800

Browse files
dail8859dail8859
committed
Change VS build output paths
1 parent ce4ef08 commit 122c800

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,3 +289,5 @@ __pycache__/
289289

290290
LuaDist
291291
/docs_gen/Editor.lua
292+
bin/
293+
src/build/

‎src/Lua.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,17 @@
131131
<PropertyGroup Label="UserMacros" />
132132
<PropertyGroup>
133133
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
134-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
135-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
134+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Configuration)_$(Platform)\</OutDir>
135+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
136136
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
137-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
138-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
137+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Configuration)_$(Platform)\</OutDir>
138+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
139139
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
140-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
141-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
140+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Configuration)_$(Platform)\</OutDir>
141+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
142142
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
143-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
144-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
143+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Configuration)_$(Platform)\</OutDir>
144+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
145145
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
146146
</PropertyGroup>
147147
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎src/LuaScript.vcxproj‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,25 @@
6969
<PropertyGroup Label="UserMacros" />
7070
<PropertyGroup>
7171
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
72-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">bin\$(Configuration)\</OutDir>
73-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
72+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\$(Configuration)_$(Platform)\</OutDir>
73+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
7474
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
75-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">bin\$(Platform)\$(Configuration)\</OutDir>
76-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
75+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\$(Configuration)_$(Platform)\</OutDir>
76+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
7777
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
78-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">bin\$(Configuration)\</OutDir>
79-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
78+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\$(Configuration)_$(Platform)\</OutDir>
79+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
8080
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
81-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Platform)\$(Configuration)\</OutDir>
82-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
81+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\$(Configuration)_$(Platform)\</OutDir>
82+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">build\$(Configuration)_$(Platform)\$(ProjectName)\</IntDir>
8383
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
8484
</PropertyGroup>
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
86+
<TargetName>$(ProjectName)_64</TargetName>
87+
</PropertyGroup>
88+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
89+
<TargetName>$(ProjectName)_64</TargetName>
90+
</PropertyGroup>
8591
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8692
<ClCompile>
8793
<AdditionalIncludeDirectories>.\SciTE;.\lua\src;.\Dialogs;.\Npp;.\Utilities;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -112,7 +118,7 @@
112118
<DataExecutionPrevention>true</DataExecutionPrevention>
113119
<ImportLibrary>$(OutDir)LuaScript.lib</ImportLibrary>
114120
<TargetMachine>MachineX86</TargetMachine>
115-
<AdditionalLibraryDirectories>$(Configuration)\Lua\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
121+
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
116122
</Link>
117123
<PostBuildEvent>
118124
<Command>copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins"</Command>
@@ -139,15 +145,15 @@
139145
</ClCompile>
140146
<Link>
141147
<AdditionalDependencies>Lua.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
142-
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
148+
<OutputFile>$(OutDir)$(ProjectName)_64.dll</OutputFile>
143149
<GenerateDebugInformation>true</GenerateDebugInformation>
144150
<SubSystem>Windows</SubSystem>
145151
<OptimizeReferences>true</OptimizeReferences>
146152
<EnableCOMDATFolding>true</EnableCOMDATFolding>
147153
<RandomizedBaseAddress>false</RandomizedBaseAddress>
148154
<DataExecutionPrevention>true</DataExecutionPrevention>
149155
<ImportLibrary>$(OutDir)LuaScript.lib</ImportLibrary>
150-
<AdditionalLibraryDirectories>$(Platform)\$(Configuration)\Lua\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156+
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
151157
</Link>
152158
<PostBuildEvent>
153159
<Command>copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins"</Command>
@@ -178,7 +184,7 @@
178184
<DataExecutionPrevention>true</DataExecutionPrevention>
179185
<ImportLibrary>$(OutDir)LuaScript.lib</ImportLibrary>
180186
<TargetMachine>MachineX86</TargetMachine>
181-
<AdditionalLibraryDirectories>$(Configuration)\Lua\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
187+
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
182188
</Link>
183189
<PostBuildEvent>
184190
<Command>copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins"</Command>
@@ -200,14 +206,14 @@
200206
</ClCompile>
201207
<Link>
202208
<AdditionalDependencies>Lua.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
203-
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
209+
<OutputFile>$(OutDir)$(ProjectName)_64.dll</OutputFile>
204210
<GenerateDebugInformation>true</GenerateDebugInformation>
205211
<ProgramDatabaseFile>$(OutDir)LuaScript.pdb</ProgramDatabaseFile>
206212
<SubSystem>Windows</SubSystem>
207213
<RandomizedBaseAddress>false</RandomizedBaseAddress>
208214
<DataExecutionPrevention>true</DataExecutionPrevention>
209215
<ImportLibrary>$(OutDir)LuaScript.lib</ImportLibrary>
210-
<AdditionalLibraryDirectories>$(Platform)\$(Configuration)\Lua\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
216+
<AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
211217
</Link>
212218
<PostBuildEvent>
213219
<Command>copy "$(TargetPath)" "C:\Program Files\Notepad++\plugins"</Command>

0 commit comments

Comments
 (0)