Convert to VS2019

lygstate · Apr 27, 2020 · c23971a · c23971a
1 parent 9aa97ca
commit c23971a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/plugin/NotepadStarterPlugin.vcxproj b/plugin/NotepadStarterPlugin.vcxproj
@@ -136,7 +136,7 @@
     </ClCompile>
     <Link>
       <SubSystem>NotSet</SubSystem>
-      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"5.01" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"6.00" %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -172,7 +172,7 @@
       <SubSystem>NotSet</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"5.01" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"6.00" %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/starter/NotepadStarter.vcxproj b/starter/NotepadStarter.vcxproj
@@ -120,7 +120,7 @@
     </ClCompile>
     <Link>
       <SubSystem>NotSet</SubSystem>
-      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"5.01" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"6.00" %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
       <Command>call $(ProjectDir)NotepadStarterRelease.bat $(PlatformTarget) $(Configuration)</Command>
@@ -164,7 +164,7 @@
       <SubSystem>NotSet</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"5.01" %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /SUBSYSTEM:WINDOWS,"6.00" %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
       <Command>call $(ProjectDir)NotepadStarterRelease.bat $(PlatformTarget) $(Configuration)</Command>

diff --git a/starter/NotepadStarterRelease.bat b/starter/NotepadStarterRelease.bat
@@ -3,16 +3,17 @@ cd /d %~dps0\..
 echo Release with: %1 %2 %CD%
 set "CONFIGURATION=%2"
 rd /s /q bin
-mkdir bin\plugins\NotepadStarter
-copy /y starter\NotepadStarterInstall.bat bin\plugins\NotepadStarter\
-copy /y starter\NotepadStarterUninstall.bat bin\plugins\NotepadStarter\
-copy /y starter\NotepadStarterReplacer.bat bin\plugins\NotepadStarter\
-copy /y starter\request-admin.bat bin\plugins\NotepadStarter\
-copy /y readme.md  bin\plugins\NotepadStarter\
+set ReleaseDir=bin\%1\%2\plugins
+mkdir %ReleaseDir%\NotepadStarter
+copy /y starter\NotepadStarterInstall.bat %ReleaseDir%\NotepadStarter\
+copy /y starter\NotepadStarterUninstall.bat %ReleaseDir%\NotepadStarter\
+copy /y starter\NotepadStarterReplacer.bat %ReleaseDir%\NotepadStarter\
+copy /y starter\request-admin.bat %ReleaseDir%\NotepadStarter\
+copy /y readme.md  %ReleaseDir%\NotepadStarter\
 if "%1" == "x86" (
-  copy /y %CONFIGURATION%\NotepadStarter.exe bin\plugins\NotepadStarter\
-  copy /y %CONFIGURATION%\NotepadStarterPlugin.dll bin\plugins\
+  copy /y %CONFIGURATION%\NotepadStarter.exe %ReleaseDir%\NotepadStarter\
+  copy /y %CONFIGURATION%\NotepadStarterPlugin.dll %ReleaseDir%\
 ) else (
-  copy /y x64\%CONFIGURATION%\NotepadStarter.exe bin\plugins\NotepadStarter\
-  copy /y x64\%CONFIGURATION%\NotepadStarterPlugin.dll bin\plugins\
+  copy /y x64\%CONFIGURATION%\NotepadStarter.exe %ReleaseDir%\NotepadStarter\
+  copy /y x64\%CONFIGURATION%\NotepadStarterPlugin.dll %ReleaseDir%\
 )