Skip to content

Fix for the runtime error submitted. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joce wants to merge 1 commit into from
Closed

Fix for the runtime error submitted. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions NppPlugin/project/NppPlugin.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'" />
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug-ANSI|Win32'">E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug-ANSI|Win32'">$(ProjectDir)..\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\include;$(IncludePath)</IncludePath>
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'">$(ProjectDir)..\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down
25 changes: 14 additions & 11 deletions PythonScript/project/PythonScript2010.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,35 +82,35 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<IncludePath>$(PythonBase)Include;$(SolutionDir)NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(SolutionDir)NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(Configuration)2\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<IncludePath>$(PythonBase)Include;$(SolutionDir)NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(SolutionDir)NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(Configuration)2\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-ANSI|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(PythonBase)\Include;E:\work\PythonScript\NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<IncludePath>$(PythonBase)Include;$(SolutionDir)NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(SolutionDir)NppPlugin\bin\debug;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
<IntDir>$(Configuration)2\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>E:\work\PythonScript\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\release;$(LibraryPath)</LibraryPath>
<IncludePath>$(PythonBase)Include;$(SolutionDir)NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(SolutionDir)NppPlugin\bin\release;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-ANSI|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>E:\work\PythonScript\NppPlugin\include;$(PythonBase)\Include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);E:\work\PythonScript\NppPlugin\bin\release;$(LibraryPath)</LibraryPath>
<IncludePath>$(PythonBase)Include;$(SolutionDir)NppPlugin\include;$(IncludePath)</IncludePath>
<LibraryPath>$(BoostPythonLibPath);$(PythonLibPath);$(SolutionDir)NppPlugin\bin\release;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand All @@ -130,8 +130,11 @@
<ShowProgress>LinkVerbose</ShowProgress>
</Link>
<PostBuildEvent>
<Command>copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++5.8\plugins"</Command>
<Command>REM copy $(OutDir)$(TargetFileName) "C:\Program Files (x86)\Notepad++5.8\plugins"</Command>
</PostBuildEvent>
<PreLinkEvent>
<Command>echo $(ProjectDir)..\bin\debug</Command>
</PreLinkEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'">
<ClCompile>
Expand Down
6 changes: 3 additions & 3 deletions PythonScript/project/PythonSettings.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<PythonBase>E:\work\Python-2.7</PythonBase>
<PythonLibPath>$(PythonBase)\PCbuild</PythonLibPath>
<BoostPythonLibPath>E:\libs\boost\bin.v2\libs\python\build\msvc-10.0\$(Configuration)\link-static\runtime-link-static\threading-multi</BoostPythonLibPath>
<PythonBase>$(PYTHONPATH)\</PythonBase>
<PythonLibPath>$(PythonBase)\libs\</PythonLibPath>
<BoostPythonLibPath>c:\boost_1_44_0\bin.v2\libs\python\build\msvc-10.0\$(Configuration)\link-static\runtime-link-static\threading-multi\</BoostPythonLibPath>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
Expand Down
2 changes: 1 addition & 1 deletion PythonScript/src/PythonScript.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ IDI_FOLDERCLOSED ICON "FolderClosed.ico"
IDI_FOLDEROPEN ICON "FolderOpen.ico"
IDI_PYTHON ICON "python.ico"
IDI_PYTHON8 ICON "python2.ico"
IDI_ICON1 ICON "E:\\work\\NppExec\\src\\ConsoleIcon.ico"
//IDI_ICON1 ICON "E:\\work\\NppExec\\src\\ConsoleIcon.ico"

/////////////////////////////////////////////////////////////////////////////
//
Expand Down