diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 55c2d0dc81..70109e6a56 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -1879,13 +1879,12 @@ def Package(target, inputs, opts):
         oscmd(command)
 
         if GetTarget() == 'windows':
-            # TODO: build p3dWrapper.c executable.
-            #objfile = FindLocation('p3dWrapper_' + basename + '.obj', [])
-            #CompileCxx(objfile, 'p3dWrapper.c', ['DIR:direct/src/p3d'])
+            # Make an .exe that calls this .p3d.
+            objfile = FindLocation('p3dWrapper_' + basename + '.obj', [])
+            CompileCxx(objfile, 'direct/src/p3d/p3dWrapper.c', [])
 
-            #exefile = os.path.splitext(target)[0] + '.exe'
-            #CompileLink(exefile, [objfile], ['ADVAPI'])
-            pass
+            exefile = FindLocation(basename + '.exe', [])
+            CompileLink(exefile, [objfile], ['ADVAPI'])
 
         # Move it to the bin directory.
         os.rename(GetOutputDir() + '/stage/' + basename + P3DSUFFIX + '.p3d', target)
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index f0e6f3fd12..f67ca9754d 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -1874,7 +1874,7 @@ def SdkLocatePython(prefer_thirdparty_python=False):
         if (GetTargetArch() == 'x64' and os.path.isdir(SDK["PYTHON"] + "-x64")):
             SDK["PYTHON"] += "-x64"
 
-        SDK["PYTHONEXEC"] = SDK["PYTHON"].replace('/', '\\') + "\\python"
+        SDK["PYTHONEXEC"] = SDK["PYTHON"].replace('\\', '/') + "/python"
         if (GetOptimize() <= 2):
             SDK["PYTHONEXEC"] += "_d.exe"
         else: