|
82 | 82 | <PropertyGroup Label="UserMacros" /> |
83 | 83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
84 | 84 | <LinkIncremental>true</LinkIncremental> |
85 | | - <IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath> |
86 | | - <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
| 85 | + <IncludePath>$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)</IncludePath> |
| 86 | + <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
87 | 87 | <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> |
88 | 88 | <IntDir>$(Configuration)2\</IntDir> |
89 | 89 | </PropertyGroup> |
90 | 90 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'"> |
91 | 91 | <LinkIncremental>true</LinkIncremental> |
92 | | - <IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath> |
93 | | - <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
| 92 | + <IncludePath>$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)</IncludePath> |
| 93 | + <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
94 | 94 | <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> |
95 | 95 | <IntDir>$(Configuration)2\</IntDir> |
96 | 96 | </PropertyGroup> |
97 | 97 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-ANSI|Win32'"> |
98 | 98 | <LinkIncremental>true</LinkIncremental> |
99 | | - <IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath> |
100 | | - <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
| 99 | + <IncludePath>$(PythonBase)\Include;$(ProjectDir)..\..\NppPlugin\include;$(IncludePath)</IncludePath> |
| 100 | + <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath> |
101 | 101 | <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> |
102 | 102 | <IntDir>$(Configuration)2\</IntDir> |
103 | 103 | </PropertyGroup> |
104 | 104 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
105 | 105 | <LinkIncremental>false</LinkIncremental> |
106 | | - <IncludePath>E:\work\PythonScript\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath> |
107 | | - <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\release;$(LibraryPath)</LibraryPath> |
| 106 | + <IncludePath>$(ProjectDir)..\..\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath> |
| 107 | + <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\release;$(LibraryPath)</LibraryPath> |
108 | 108 | <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> |
109 | 109 | </PropertyGroup> |
110 | 110 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'"> |
111 | 111 | <LinkIncremental>false</LinkIncremental> |
112 | | - <IncludePath>E:\work\PythonScript\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath> |
113 | | - <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\release;$(LibraryPath)</LibraryPath> |
| 112 | + <IncludePath>$(ProjectDir)..\..\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath> |
| 113 | + <LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(ProjectDir)..\..\NppPlugin\bin\release;$(LibraryPath)</LibraryPath> |
114 | 114 | <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir> |
115 | 115 | </PropertyGroup> |
116 | 116 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
|
120 | 120 | <Optimization>Disabled</Optimization> |
121 | 121 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
122 | 122 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
123 | | - <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 123 | + <AdditionalIncludeDirectories>../include;../res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 124 | + <MultiProcessorCompilation>true</MultiProcessorCompilation> |
124 | 125 | </ClCompile> |
125 | 126 | <Link> |
126 | 127 | <SubSystem>Windows</SubSystem> |
127 | 128 | <GenerateDebugInformation>true</GenerateDebugInformation> |
128 | 129 | <AdditionalDependencies>python27.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> |
129 | | - <AdditionalLibraryDirectories>C:\Program Files (x86)\HTML Help Workshop\lib</AdditionalLibraryDirectories> |
| 130 | + <AdditionalLibraryDirectories>$(HtmlHelpBase)\lib</AdditionalLibraryDirectories> |
130 | 131 | <ShowProgress>LinkVerbose</ShowProgress> |
131 | 132 | </Link> |
132 | 133 | <PostBuildEvent> |
|
146 | 147 | <SubSystem>Windows</SubSystem> |
147 | 148 | <GenerateDebugInformation>true</GenerateDebugInformation> |
148 | 149 | <AdditionalDependencies>python26.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> |
149 | | - <AdditionalLibraryDirectories>C:\Program Files (x86)\HTML Help Workshop\lib</AdditionalLibraryDirectories> |
| 150 | + <AdditionalLibraryDirectories>$(HtmlHelpBase)\lib</AdditionalLibraryDirectories> |
150 | 151 | </Link> |
151 | 152 | <PostBuildEvent> |
152 | 153 | <Command>copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins"</Command> |
|
165 | 166 | <SubSystem>Windows</SubSystem> |
166 | 167 | <GenerateDebugInformation>true</GenerateDebugInformation> |
167 | 168 | <AdditionalDependencies>python26.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> |
168 | | - <AdditionalLibraryDirectories>C:\Program Files (x86)\HTML Help Workshop\lib</AdditionalLibraryDirectories> |
| 169 | + <AdditionalLibraryDirectories>$(HtmlHelpBase)\lib</AdditionalLibraryDirectories> |
169 | 170 | </Link> |
170 | 171 | <PostBuildEvent> |
171 | 172 | <Command>copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++\plugins"</Command> |
|
174 | 175 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
175 | 176 | <ClCompile> |
176 | 177 | <WarningLevel>Level4</WarningLevel> |
177 | | - <PrecompiledHeader>NotUsing</PrecompiledHeader> |
| 178 | + <PrecompiledHeader>Use</PrecompiledHeader> |
178 | 179 | <Optimization>MaxSpeed</Optimization> |
179 | 180 | <FunctionLevelLinking>true</FunctionLevelLinking> |
180 | 181 | <IntrinsicFunctions>true</IntrinsicFunctions> |
181 | 182 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHONSCRIPT2010_EXPORTS;BOOST_PYTHON_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
182 | 183 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
183 | 184 | <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 185 | + <MultiProcessorCompilation>true</MultiProcessorCompilation> |
184 | 186 | </ClCompile> |
185 | 187 | <Link> |
186 | 188 | <SubSystem>Windows</SubSystem> |
187 | 189 | <GenerateDebugInformation>true</GenerateDebugInformation> |
188 | 190 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
189 | 191 | <OptimizeReferences>true</OptimizeReferences> |
190 | 192 | <AdditionalDependencies>python27.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> |
191 | | - <AdditionalLibraryDirectories>C:\Program Files (x86)\HTML Help Workshop\lib</AdditionalLibraryDirectories> |
| 193 | + <AdditionalLibraryDirectories>$(HtmlHelpBase)\lib</AdditionalLibraryDirectories> |
192 | 194 | </Link> |
193 | 195 | </ItemDefinitionGroup> |
194 | 196 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'"> |
|
208 | 210 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
209 | 211 | <OptimizeReferences>true</OptimizeReferences> |
210 | 212 | <AdditionalDependencies>python26.lib;NppPlugin.lib;shlwapi.lib;comctl32.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies> |
211 | | - <AdditionalLibraryDirectories>C:\Program Files (x86)\HTML Help Workshop\lib</AdditionalLibraryDirectories> |
| 213 | + <AdditionalLibraryDirectories>$(HtmlHelpBase)\lib</AdditionalLibraryDirectories> |
212 | 214 | </Link> |
213 | 215 | </ItemDefinitionGroup> |
214 | 216 | <ItemGroup> |
215 | | - <None Include="..\..\..\nppexec\src\bitmap1.bmp" /> |
216 | | - <None Include="..\..\..\NppExec\src\ConsoleIcon.ico" /> |
217 | | - <None Include="..\..\..\nppexec\src\icon2.ico" /> |
218 | | - <None Include="..\src\bitmap2.bmp" /> |
219 | | - <None Include="..\src\FolderClosed.ico" /> |
220 | | - <None Include="..\src\FolderOpen.ico" /> |
221 | | - <None Include="..\src\python-powered-w-140x56.bmp" /> |
222 | | - <None Include="..\src\python-powered-w-140x56.png"> |
223 | | - <DeploymentContent>false</DeploymentContent> |
224 | | - <FileType>BMP</FileType> |
225 | | - </None> |
226 | | - <None Include="..\src\python.bmp" /> |
227 | | - <None Include="..\src\python.ico" /> |
228 | | - <None Include="..\src\python2.ico" /> |
229 | | - <None Include="FolderClosed.ico" /> |
230 | | - <None Include="FolderOpen.ico" /> |
231 | | - <None Include="python-powered-w-140x56.bmp" /> |
232 | | - <None Include="python-powered-w-140x56.png" /> |
233 | | - <None Include="python.bmp" /> |
234 | | - <None Include="python.ico" /> |
235 | | - <None Include="python2.ico" /> |
236 | | - <None Include="ReadMe.txt" /> |
| 217 | + <None Include="..\res\FolderClosed.ico" /> |
| 218 | + <None Include="..\res\FolderOpen.ico" /> |
| 219 | + <None Include="..\res\python-powered-w-140x56.bmp" /> |
| 220 | + <None Include="..\res\python.bmp" /> |
| 221 | + <None Include="..\res\python.ico" /> |
| 222 | + <None Include="..\res\python2.ico" /> |
| 223 | + <None Include="..\res\ReadMe.txt" /> |
237 | 224 | </ItemGroup> |
238 | 225 | <ItemGroup> |
239 | 226 | <ClCompile Include="..\src\AboutDialog2.cpp" /> |
|
262 | 249 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> |
263 | 250 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'">Create</PrecompiledHeader> |
264 | 251 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-ANSI|Win32'">Create</PrecompiledHeader> |
| 252 | + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> |
265 | 253 | </ClCompile> |
266 | 254 | <ClCompile Include="..\src\WcharMbcsConverter.cpp" /> |
267 | 255 | </ItemGroup> |
|
287 | 275 | <ClInclude Include="..\src\PythonHandler.h" /> |
288 | 276 | <ClInclude Include="..\src\PythonScript.h" /> |
289 | 277 | <ClInclude Include="..\src\PythonScriptVersion.h" /> |
290 | | - <ClInclude Include="..\src\resource.h" /> |
| 278 | + <ClInclude Include="..\res\resource.h" /> |
291 | 279 | <ClInclude Include="..\src\ScintillaCells.h" /> |
292 | 280 | <ClInclude Include="..\src\ScintillaNotifications.h" /> |
293 | 281 | <ClInclude Include="..\src\ScintillaPython.h" /> |
|
296 | 284 | <ClInclude Include="..\src\StaticIDAllocator.h" /> |
297 | 285 | <ClInclude Include="..\src\stdafx.h" /> |
298 | 286 | <ClInclude Include="..\src\WcharMbcsConverter.h" /> |
299 | | - <ClInclude Include="..\src\resource1.h" /> |
| 287 | + <ClInclude Include="..\res\resource1.h" /> |
300 | 288 | </ItemGroup> |
301 | 289 | <ItemGroup> |
302 | | - <ResourceCompile Include="..\src\PythonScript.rc" /> |
303 | | - <ResourceCompile Include="..\src\PythonScriptVersion.rc" /> |
| 290 | + <ResourceCompile Include="..\res\PythonScript.rc" /> |
| 291 | + <ResourceCompile Include="..\res\PythonScriptVersion.rc" /> |
304 | 292 | </ItemGroup> |
305 | 293 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
306 | 294 | <ImportGroup Label="ExtensionTargets"> |
|
0 commit comments