diff options
| author | Damien George | 2017-09-06 13:40:51 +1000 |
|---|---|---|
| committer | Damien George | 2017-09-06 13:40:51 +1000 |
| commit | 01dd7804b87d60b2deab16712eccb3b97351a9b7 (patch) | |
| tree | 1aa21f38a872b8e62a3d4e4f74f68033c6f827e4 /windows/msvc | |
| parent | a9862b30068fc9df1022f08019fb35aaa5085f64 (diff) | |
ports: Make new ports/ sub-directory and move all ports there.
This is to keep the top-level directory clean, to make it clear what is
core and what is a port, and to allow the repository to grow with new ports
in a sustainable way.
Diffstat (limited to 'windows/msvc')
| -rw-r--r-- | windows/msvc/common.props | 47 | ||||
| -rw-r--r-- | windows/msvc/debug.props | 9 | ||||
| -rw-r--r-- | windows/msvc/dirent.c | 103 | ||||
| -rw-r--r-- | windows/msvc/dirent.h | 48 | ||||
| -rw-r--r-- | windows/msvc/genhdr.targets | 117 | ||||
| -rw-r--r-- | windows/msvc/gettimeofday.c | 58 | ||||
| -rw-r--r-- | windows/msvc/paths.props | 45 | ||||
| -rw-r--r-- | windows/msvc/release.props | 16 | ||||
| -rw-r--r-- | windows/msvc/sources.props | 37 | ||||
| -rw-r--r-- | windows/msvc/sys/time.h | 32 | ||||
| -rw-r--r-- | windows/msvc/unistd.h | 44 |
11 files changed, 0 insertions, 556 deletions
diff --git a/windows/msvc/common.props b/windows/msvc/common.props deleted file mode 100644 index 26ea78e7e..000000000 --- a/windows/msvc/common.props +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets"> - <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <OutDir>$(PyOutDir)</OutDir> - <IntDir>$(PyIntDir)</IntDir> - <PyFileCopyCookie>$(PyBuildDir)copycookie$(Configuration)$(Platform)</PyFileCopyCookie> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <AdditionalIncludeDirectories>$(PyIncDirs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <SDLCheck>false</SDLCheck> - <WarningLevel>Level1</WarningLevel> - <ExceptionHandling>false</ExceptionHandling> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <MinimalRebuild>false</MinimalRebuild> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <GenerateMapFile>true</GenerateMapFile> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <PyOutputFiles Include="$(TargetPath)"> - <Destination>$(PyWinDir)%(FileName)%(Extension)</Destination> - </PyOutputFiles> - <PyCookieFiles Include="$(PyBuildDir)copycookie*" Exclude="$(PyFileCopyCookie)"/> - </ItemGroup> - - <!-- Copy PyOutputFiles to their target destination. - To force this when switching between platforms/configurations which are already up-to-date (and as such, - for which a build wouldn't even start because all outputs are effectively newer than the inputs) - an empty file $(PyFileCopyCookie) is created serving as a record to indicate what was last copied, - and any previous records are deleted. So when switching between builds which are otherwise up-to-date - the tracker will notice a missing file and a build is started anyway (and it will just copy our files). --> - <Target Name="CopyFilesToWinDir" AfterTargets="Build" - Inputs="$(TargetPath)" Outputs="$(PyFileCopyCookie);@(PyOutputFiles->'%(Destination)')"> - <Delete Files="@(PyCookieFiles)"/> - <Touch Files="$(PyFileCopyCookie)" AlwaysCreate="true"/> - <Copy SourceFiles="%(PyOutputFiles.Identity)" DestinationFiles="%(PyOutputFiles.Destination)"/> - <WriteLinesToFile File="$(TLogLocation)$(ProjectName).write.u.tlog" Lines="$(PyFileCopyCookie);@(PyOutputFiles->'%(Destination)')" Overwrite="True"/> - </Target> -</Project> diff --git a/windows/msvc/debug.props b/windows/msvc/debug.props deleted file mode 100644 index fa1ca4fcb..000000000 --- a/windows/msvc/debug.props +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - </PropertyGroup> - <ItemDefinitionGroup /> - <ItemGroup /> -</Project>
\ No newline at end of file diff --git a/windows/msvc/dirent.c b/windows/msvc/dirent.c deleted file mode 100644 index e050432a1..000000000 --- a/windows/msvc/dirent.c +++ /dev/null @@ -1,103 +0,0 @@ -/* -* This file is part of the MicroPython project, http://micropython.org/ -* -* The MIT License (MIT) -* -* Copyright (c) 2015 Damien P. George -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ - -#include "dirent.h" -#include <errno.h> -#include <Windows.h> - -typedef struct DIR { - HANDLE findHandle; - WIN32_FIND_DATA findData; - struct dirent result; -} DIR; - -DIR *opendir(const char *name) { - if (!name || !*name) { - errno = ENOENT; - return NULL; - } - - DIR *dir = malloc(sizeof(DIR)); - if (!dir) { - errno = ENOMEM; - return NULL; - } - dir->result.d_ino = 0; - dir->result.d_name = NULL; - dir->findHandle = INVALID_HANDLE_VALUE; - - const size_t nameLen = strlen(name); - char *path = malloc(nameLen + 3); // allocate enough for adding "/*" - if (!path) { - free(dir); - errno = ENOMEM; - return NULL; - } - strcpy(path, name); - - // assure path ends with wildcard - const char lastChar = path[nameLen - 1]; - if (lastChar != '*') { - const char *appendWC = (lastChar != '/' && lastChar != '\\') ? "/*" : "*"; - strcat(path, appendWC); - } - - // init - dir->findHandle = FindFirstFile(path, &dir->findData); - free(path); - if (dir->findHandle == INVALID_HANDLE_VALUE) { - free(dir); - errno = ENOENT; - return NULL; - } - return dir; -} - -int closedir(DIR *dir) { - if (dir) { - FindClose(dir->findHandle); - free(dir); - return 0; - } else { - errno = EBADF; - return -1; - } -} - -struct dirent *readdir(DIR *dir) { - if (!dir) { - errno = EBADF; - return NULL; - } - - // first pass d_name is NULL so use result from FindFirstFile in opendir, else use FindNextFile - if (!dir->result.d_name || FindNextFile(dir->findHandle, &dir->findData)) { - dir->result.d_name = dir->findData.cFileName; - return &dir->result; - } - - return NULL; -} diff --git a/windows/msvc/dirent.h b/windows/msvc/dirent.h deleted file mode 100644 index fca06785a..000000000 --- a/windows/msvc/dirent.h +++ /dev/null @@ -1,48 +0,0 @@ -/* -* This file is part of the MicroPython project, http://micropython.org/ -* -* The MIT License (MIT) -* -* Copyright (c) 2015 Damien P. George -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ -#ifndef MICROPY_INCLUDED_WINDOWS_MSVC_DIRENT_H -#define MICROPY_INCLUDED_WINDOWS_MSVC_DIRENT_H - -// dirent.h implementation for msvc - -// for ino_t -#include <sys/types.h> - -// opaque DIR structure -typedef struct DIR DIR; - -// the dirent structure -// d_ino is always 0 - if ever needed use GetFileInformationByHandle -typedef struct dirent { - ino_t d_ino; - char *d_name; -} dirent; - -DIR *opendir(const char *name); -int closedir(DIR *dir); -struct dirent *readdir(DIR *dir); - -#endif // MICROPY_INCLUDED_WINDOWS_MSVC_DIRENT_H diff --git a/windows/msvc/genhdr.targets b/windows/msvc/genhdr.targets deleted file mode 100644 index cac3e3ddc..000000000 --- a/windows/msvc/genhdr.targets +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="GenerateHeaders"> - - <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> - - <!--Generate qstrdefs.generated.h and mpversion.h similar to what is done in py/mkrules.mk and py/py.mk--> - <Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeQstrData"> - </Target> - - <PropertyGroup> - <DestDir>$(PyBuildDir)genhdr\</DestDir> - <PySrcDir>$(PyBaseDir)py\</PySrcDir> - <QstrDefs>$(PyBaseDir)unix\qstrdefsport.h</QstrDefs> - <PyQstrDefs>$(PySrcDir)qstrdefs.h</PyQstrDefs> - <QstrDefsCollected>$(DestDir)qstrdefscollected.h</QstrDefsCollected> - <QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen> - <PyPython Condition="'$(PyPython)' == ''">python</PyPython> - </PropertyGroup> - - <Target Name="MakeDestDir"> - <MakeDir Directories="$(DestDir)"/> - </Target> - - <!-- Concatenate preprocessed files for use with makeqstrdefs.py. - Filters out any lines which aren't used by makeqstrdefs.py so the resulting file is - hundreds of times smaller and processing in python takes substantially less time--> - <UsingTask TaskName="ConcatPreProcFiles" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" > - <ParameterGroup> - <OutputFile Required="true" ParameterType="System.String"/> - <InputFiles Required="true" ParameterType="System.String[]"/> - </ParameterGroup> - <Task> - <Code Type="Fragment" Language="cs"> - <![CDATA[ -using(var outFile = System.IO.File.CreateText(OutputFile)) { - foreach(var inFile in InputFiles) - foreach(var line in System.IO.File.ReadAllLines(inFile)) - if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR")) - outFile.WriteLine( line ); -} - ]]> - </Code> - </Task> - </UsingTask> - - <!-- If any of these changed we'll force all qstrs to be generated again--> - <ItemGroup> - <QstrDependencies Include="$(PyWinDir)mpconfigport.h;$(PySrcDir)mpconfig.h;$(PySrcDir)makeqstrdata.py"/> - </ItemGroup> - - <!-- Preprocess changed files, concatenate and feed into makeqstrdefs.py split/cat--> - <Target Name="MakeQstrDefs" DependsOnTargets="MakeDestDir" Inputs="@(ClCompile);@(QstrDependencies)" Outputs="$(QstrDefsCollected)"> - <ItemGroup> - <PyIncDirs Include="$(PyIncDirs)"/> - <PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR;N_X64;N_X86;N_THUMB;N_ARM"/> - <PyQstrSourceFiles Include="@(ClCompile)"> - <OutFile>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', '$(DestDir)qstr\'))</OutFile> - </PyQstrSourceFiles> - <PyQstrSourceFiles> - <OutFile>$([System.IO.Path]::ChangeExtension('%(OutFile)', '.pp'))</OutFile> - <OutDir>$([System.IO.Path]::GetDirectoryName('%(OutFile)'))</OutDir> - </PyQstrSourceFiles> - <PyQstrSourceFiles> - <Changed Condition="$([System.DateTime]::Compare($([System.IO.File]::GetLastWriteTime('%(FullPath)')), $([System.IO.File]::GetLastWriteTime('%(OutFile)')))) > 0">True</Changed> - </PyQstrSourceFiles> - <QstrDependencies> - <Changed Condition="$([System.DateTime]::Compare($([System.IO.File]::GetLastWriteTime('%(FullPath)')), $([System.IO.File]::GetLastWriteTime('$(DestDir)qstr.i.last')))) > 0">True</Changed> - </QstrDependencies> - </ItemGroup> - <PropertyGroup> - <ForceQstrRebuild>@(QstrDependencies->AnyHaveMetadataValue('Changed', 'True'))</ForceQstrRebuild> - <RunPreProcConcat>@(PyQstrSourceFiles->AnyHaveMetadataValue('Changed', 'True'))</RunPreProcConcat> - </PropertyGroup> - - <MakeDir Directories="@(PyQstrSourceFiles->'%(OutDir)')"/> - <Exec Command="cl /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /Fi%(PyQstrSourceFiles.OutFile) /P %(PyQstrSourceFiles.Identity)" - Condition="'%(PyQstrSourceFiles.Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/> - <ConcatPreProcFiles InputFiles="@(PyQstrSourceFiles->'%(OutFile)')" OutputFile="$(DestDir)qstr.i.last" - Condition="'$(RunPreProcConcat)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/> - <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split $(DestDir)qstr.i.last $(DestDir)qstr $(QstrDefsCollected)"/> - <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat $(DestDir)qstr.i.last $(DestDir)qstr $(QstrDefsCollected)"/> - </Target> - - <Target Name="MakeQstrData" DependsOnTargets="MakeQstrDefs" Inputs="$(QstrDefsCollected);$(PyQstrDefs);$(QstrDefs)" Outputs="$(QstrGen)"> - <PropertyGroup> - <TmpFile>$(QstrGen).tmp</TmpFile> - </PropertyGroup> - <Exec Command="cl /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /E $(PyQstrDefs) $(QstrDefs) > $(DestDir)qstrdefspreprocessed.h"/> - <Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefspreprocessed.h $(QstrDefsCollected) > $(TmpFile)"/> - <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(QstrGen)"/> - </Target> - - <Target Name="MakeVersionHdr" DependsOnTargets="MakeDestDir"> - <PropertyGroup> - <DestFile>$(DestDir)mpversion.h</DestFile> - <TmpFile>$(DestFile).tmp</TmpFile> - </PropertyGroup> - <Exec Command="$(PyPython) $(PySrcDir)makeversionhdr.py $(TmpFile)"/> - <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/> - </Target> - - <Target Name="RemoveGeneratedFiles" AfterTargets="Clean"> - <RemoveDir Directories="$(DestDir)"/> - </Target> - - <!--Copies SourceFile to DestFile only if SourceFile's content differs from DestFile's. - We use this to 'touch' the generated files only when they are really newer - so a build is only triggered if the generated content actually changed, - and not just because the file date changed since the last build--> - <Target Name="CopyFileIfDifferent"> - <Exec Command="fc /B $(SourceFile) $(DestFile) > NUL 2>&1" IgnoreExitCode="true"> - <Output TaskParameter="ExitCode" PropertyName="FilesDiffer" /> - </Exec> - <Copy SourceFiles="$(SourceFile)" DestinationFiles="$(DestFile)" Condition="'$(FilesDiffer)'!='0'"/> - </Target> - -</Project> diff --git a/windows/msvc/gettimeofday.c b/windows/msvc/gettimeofday.c deleted file mode 100644 index 5f816df70..000000000 --- a/windows/msvc/gettimeofday.c +++ /dev/null @@ -1,58 +0,0 @@ -/* -* This file is part of the MicroPython project, http://micropython.org/ -* -* The MIT License (MIT) -* -* Copyright (c) 2013, 2014 Damien P. George -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ - -#include <Winsock2.h> - -typedef union { - unsigned __int64 tm; // time in 100 nanoseconds interval - FILETIME ft; -} FT; - -int gettimeofday(struct timeval *tp, struct timezone *tz) { - if (tp == NULL) { - return 0; - } - - // UTC time - FT ft; - ZeroMemory(&ft, sizeof(ft)); - GetSystemTimeAsFileTime(&ft.ft); - - // to microseconds - ft.tm /= 10; - - // convert to unix format - // number of microseconds intervals between the 1st january 1601 and the 1st january 1970 (369 years + 89 leap days) - const unsigned __int64 deltaEpoch = 11644473600000000ull; - const unsigned __int64 microSecondsToSeconds = 1000000ull; - tp->tv_usec = ft.tm % microSecondsToSeconds; - tp->tv_sec = (ft.tm - deltaEpoch) / microSecondsToSeconds; - - // see man gettimeofday: timezone is deprecated and expected to be NULL - (void)tz; - - return 0; -} diff --git a/windows/msvc/paths.props b/windows/msvc/paths.props deleted file mode 100644 index 716698243..000000000 --- a/windows/msvc/paths.props +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <PyPathsIncluded>True</PyPathsIncluded> - - <!-- The properties below specify the output directory structure. - This defaults to, for example for Configuration = Debug and Platform = x64: - - micropython [PyBaseDir] - |- ... - |- windows [PyWinDir] - |- ... - |- micropython.exe - |- build [PyBuildDir] - |- Debugx64 [PyOutDir] - | |- ... - | |- micropython.exe - | |- micropython.map - | |- obj [PyIntDir] - |- genhdr - - Note that the micropython executable will be copied from PyOutDir - to PyWinDir after each build. --> - - <!-- Start from project root --> - <PyBaseDir>$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..`))\</PyBaseDir> - <PyWinDir>$(PyBaseDir)windows\</PyWinDir> - <PyBuildDir Condition="'$(PyBuildDir)' == ''">$(PyWinDir)build\</PyBuildDir> - - <!-- All include directories needed for uPy --> - <PyIncDirs>$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc</PyIncDirs> - - <!-- Within PyBuildDir different subdirectories are used based on configuration and platform. - By default these are chosen based on the Configuration and Platform properties, but - this file might be imported by other projects (to figure out where the artifacts go - or what the include files are) and those projects might already contain conflicting - Configuration/Platform properties, so allow to override these --> - <PyPlatform Condition="'$(PyPlatform)' == ''">$(Platform)</PyPlatform> - <PyConfiguration Condition="'$(PyConfiguration)' == ''">$(Configuration)</PyConfiguration> - - <!-- The final destination directories --> - <PyOutDir>$(PyBuildDir)$(PyConfiguration)$(PyPlatform)\</PyOutDir> - <PyIntDir>$(PyOutDir)obj\</PyIntDir> - </PropertyGroup> -</Project> diff --git a/windows/msvc/release.props b/windows/msvc/release.props deleted file mode 100644 index ea0bf433d..000000000 --- a/windows/msvc/release.props +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <ItemDefinitionGroup> - <Link> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - </Link> - <ClCompile> - <IntrinsicFunctions>true</IntrinsicFunctions> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup /> -</Project> diff --git a/windows/msvc/sources.props b/windows/msvc/sources.props deleted file mode 100644 index a97686cdc..000000000 --- a/windows/msvc/sources.props +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> - <ItemGroup> - <ClCompile Include="$(PyBaseDir)py\*.c" /> - <ClCompile Include="$(PyBaseDir)windows\*.c" /> - <ClCompile Include="$(PyBaseDir)windows\msvc\*.c" /> - <ClCompile Include="$(PyBaseDir)lib\mp-readline\*.c" /> - <ClCompile Include="$(PyBaseDir)unix\file.c"/> - <ClCompile Include="$(PyBaseDir)unix\gccollect.c"/> - <ClCompile Include="$(PyBaseDir)unix\input.c"/> - <ClCompile Include="$(PyBaseDir)unix\main.c"/> - <ClCompile Include="$(PyBaseDir)unix\modos.c"/> - <ClCompile Include="$(PyBaseDir)unix\modtime.c"/> - <ClCompile Include="$(PyBaseDir)unix\modmachine.c" /> - <ClCompile Include="$(PyBaseDir)extmod\machine_mem.c" /> - <ClCompile Include="$(PyBaseDir)extmod\machine_pinbase.c" /> - <ClCompile Include="$(PyBaseDir)extmod\machine_pulse.c" /> - <ClCompile Include="$(PyBaseDir)extmod\machine_signal.c" /> - <ClCompile Include="$(PyBaseDir)extmod\modubinascii.c" /> - <ClCompile Include="$(PyBaseDir)extmod\moductypes.c" /> - <ClCompile Include="$(PyBaseDir)extmod\moduhashlib.c" /> - <ClCompile Include="$(PyBaseDir)extmod\moduheapq.c" /> - <ClCompile Include="$(PyBaseDir)extmod\modujson.c" /> - <ClCompile Include="$(PyBaseDir)extmod\modurandom.c" /> - <ClCompile Include="$(PyBaseDir)extmod\modure.c" /> - <ClCompile Include="$(PyBaseDir)extmod\modutimeq.c" /> - <ClCompile Include="$(PyBaseDir)extmod\moduzlib.c" /> - <ClCompile Include="$(PyBaseDir)extmod\utime_mphal.c" /> - <ClCompile Include="$(PyBaseDir)extmod\virtpin.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="$(PyBaseDir)py\*.h" /> - <ClInclude Include="$(PyBaseDir)windows\*.h" /> - <ClInclude Include="$(PyBaseDir)windows\msvc\*.h" /> - </ItemGroup> -</Project> diff --git a/windows/msvc/sys/time.h b/windows/msvc/sys/time.h deleted file mode 100644 index 7c95d409e..000000000 --- a/windows/msvc/sys/time.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -* This file is part of the MicroPython project, http://micropython.org/ -* -* The MIT License (MIT) -* -* Copyright (c) 2013, 2014 Damien P. George -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ -#ifndef MICROPY_INCLUDED_WINDOWS_MSVC_SYS_TIME_H -#define MICROPY_INCLUDED_WINDOWS_MSVC_SYS_TIME_H - -// Get the definitions for timeval etc -#include <Winsock2.h> - -#endif // MICROPY_INCLUDED_WINDOWS_MSVC_SYS_TIME_H diff --git a/windows/msvc/unistd.h b/windows/msvc/unistd.h deleted file mode 100644 index 1a1629be4..000000000 --- a/windows/msvc/unistd.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -* This file is part of the MicroPython project, http://micropython.org/ -* -* The MIT License (MIT) -* -* Copyright (c) 2013, 2014 Damien P. George -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to deal -* in the Software without restriction, including without limitation the rights -* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -* copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -* THE SOFTWARE. -*/ -#ifndef MICROPY_INCLUDED_WINDOWS_MSVC_UNISTD_H -#define MICROPY_INCLUDED_WINDOWS_MSVC_UNISTD_H - -// There's no unistd.h, but this is the equivalent -#include <io.h> - -#define F_OK 0 -#define W_OK 2 -#define R_OK 4 - -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 - -#define SEEK_CUR 1 -#define SEEK_END 2 -#define SEEK_SET 0 - -#endif // MICROPY_INCLUDED_WINDOWS_MSVC_UNISTD_H |
