summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2015-01-01 21:21:46 +0000
committerDamien George <damien.p.george@gmail.com>2015-01-01 21:21:46 +0000
commit0b2a60acbec3e2789e75c63b391828656ccf1c77 (patch)
treeb6cc79794987f46d4681ddecd57c2039a1d78d07
parentfe7d542352738e14c6d03bcc55b1e89b4e7c5c96 (diff)
windows: Prefix includes with py/; remove need for -I../py.
-rw-r--r--windows/Makefile1
-rw-r--r--windows/bss.c7
-rw-r--r--windows/msvc/common.props2
3 files changed, 3 insertions, 7 deletions
diff --git a/windows/Makefile b/windows/Makefile
index f73e16690..5d5c7db79 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -12,7 +12,6 @@ include ../py/py.mk
INC = -I.
INC += -I..
-INC += -I$(PY_SRC)
INC += -I$(BUILD)
# compiler settings
diff --git a/windows/bss.c b/windows/bss.c
index b860c4ee8..58509024f 100644
--- a/windows/bss.c
+++ b/windows/bss.c
@@ -24,11 +24,8 @@
* THE SOFTWARE.
*/
-#include "mpconfig.h"
-#include "misc.h"
-#include "nlr.h"
-#include "qstr.h"
-#include "obj.h"
+#include "py/nlr.h"
+#include "py/obj.h"
#include <windows.h>
IMAGE_NT_HEADERS *header_from_memory(const char *module) {
diff --git a/windows/msvc/common.props b/windows/msvc/common.props
index e886a2659..ce0651d2e 100644
--- a/windows/msvc/common.props
+++ b/windows/msvc/common.props
@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>.\;..\;.\build;.\msvc;..\py</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\;..\;.\build;.\msvc</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>false</SDLCheck>
<WarningLevel>Level1</WarningLevel>