summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--PC/WinMain.c30
-rw-r--r--PCbuild/launcher.vcproj184
-rw-r--r--PCbuild/pcbuild.sln10
3 files changed, 0 insertions, 224 deletions
diff --git a/PC/WinMain.c b/PC/WinMain.c
index 58305d1..00dc18d 100644
--- a/PC/WinMain.c
+++ b/PC/WinMain.c
@@ -2,25 +2,9 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-#include <fcntl.h>
#include "Python.h"
-#ifdef LAUNCHER
-/* Q105305 suggests this routine to adjust the handles. */
-static void adjust_file(DWORD handle, FILE* f, char* mode)
-{
- int hCrt;
- FILE *hf;
- hCrt = _open_osfhandle((intptr_t)GetStdHandle(handle), _O_TEXT);
- hf = _fdopen(hCrt, mode);
- *f = *hf;
- setvbuf(f, NULL, _IONBF, 0);
- /* Alternatively, we could use __set_app_type and _set_osfhnd,
- but that appears to be undocumented. */
-}
-#endif
-
int WINAPI WinMain(
HINSTANCE hInstance, /* handle to current instance */
HINSTANCE hPrevInstance, /* handle to previous instance */
@@ -28,19 +12,5 @@ int WINAPI WinMain(
int nCmdShow /* show state of window */
)
{
-#ifdef LAUNCHER
- int i;
- if (__argc > 1 && strcmp(__argv[1], "-console") == 0) {
- /* Allocate a console, and remove the -console argument. */
- AllocConsole();
- for (i = 2; i < __argc; i++)
- __argv[i-1] = __argv[i];
- __argc--;
- /* Make stdin, stdout, stderr use the newly allocated OS handles. */
- adjust_file(STD_INPUT_HANDLE, stdin, "r");
- adjust_file(STD_OUTPUT_HANDLE, stdout, "w");
- adjust_file(STD_ERROR_HANDLE, stderr, "w");
- }
-#endif
return Py_Main(__argc, __argv);
}
diff --git a/PCbuild/launcher.vcproj b/PCbuild/launcher.vcproj
deleted file mode 100644
index f8a1cc5..0000000
--- a/PCbuild/launcher.vcproj
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="launcher"
- ProjectGUID="{065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\."
- IntermediateDirectory=".\x86-temp-debug\launcher"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\Include,..\PC"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;LAUNCHER"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- OutputFile="$(OutDir)/$(ProjectName)_d.exe"
- LinkIncremental="2"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/launcher.pdb"
- SubSystem="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\."
- IntermediateDirectory=".\x86-temp-release\launcher"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\Include,..\PC"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LAUNCHER"
- RuntimeLibrary="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="ReleaseItanium|Win32"
- OutputDirectory="./."
- IntermediateDirectory=".\ia64-temp-release\launcher"
- ConfigurationType="1"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions=" /USECL:MS_ITANIUM"
- AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LAUNCHER"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- LinkIncremental="1"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="0"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath="..\Pc\WinMain.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
- <File
- RelativePath="..\Pc\python_exe.rc">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 97376e0..c09256f 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -79,10 +79,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcproj", "{680
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "launcher", "launcher.vcproj", "{065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@@ -185,12 +181,6 @@ Global
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Debug.ActiveCfg = Debug|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Debug.Build.0 = Debug|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Release.ActiveCfg = Release|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.Release.Build.0 = Release|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
- {065D53DF-5D8E-4CBD-AE32-B9E29D4FC5C6}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
readme.txt = readme.txt
generated by cgit v0.12 at 2024-09-28 11:26:15 (GMT)