diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 186cd589f2..5b9b31af36 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -457,7 +457,6 @@ SdkLocateMaya()
 SdkLocateMax()
 SdkLocateMacOSX(OSXTARGET)
 SdkLocatePython(RTDIST)
-SdkLocateVisualStudio(MSVC_VERSION)
 SdkLocateWindows(WINDOWS_SDK)
 SdkLocatePhysX()
 SdkLocateSpeedTree()
@@ -496,6 +495,7 @@ if RUNTIME and not HOST_URL:
 
 if GetHost() == 'windows' and GetTarget() == 'windows':
     COMPILER = "MSVC"
+    SdkLocateVisualStudio(MSVC_VERSION)
 else:
     COMPILER = "GCC"
 
@@ -737,6 +737,9 @@ if (COMPILER=="GCC"):
             IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
             LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
 
+    if GetTarget() != "windows":
+        PkgDisable("DIRECTCAM")
+
     fcollada_libs = ("FColladaD", "FColladaSD", "FColladaS")
     # WARNING! The order of the ffmpeg libraries matters!
     ffmpeg_libs = ("libavformat", "libavcodec", "libavutil")
@@ -4323,7 +4326,7 @@ if (GetTarget() == 'windows' and not RUNTIME):
 # DIRECTORY: panda/metalibs/pandadx9/
 #
 
-if PkgSkip("DX9")==0 and not RUNTIME:
+if GetTarget() == 'windows' and PkgSkip("DX9")==0 and not RUNTIME:
   OPTS=['DIR:panda/src/dxgsg9', 'BUILDING:PANDADX', 'DX9',  'NVIDIACG', 'CGDX9']
   TargetAdd('p3dxgsg9_dxGraphicsStateGuardian9.obj', opts=OPTS, input='dxGraphicsStateGuardian9.cxx')
   TargetAdd('p3dxgsg9_composite1.obj', opts=OPTS, input='p3dxgsg9_composite1.cxx')
diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py
index 43cf970c39..f395693c3f 100644
--- a/makepanda/makepandacore.py
+++ b/makepanda/makepandacore.py
@@ -2008,7 +2008,8 @@ def SdkLocateVisualStudio(version=10):
         print("Using Visual Studio %s" % (version))
 
 def SdkLocateWindows(version = '7.1'):
-    if (GetHost() != "windows"): return
+    if GetTarget() != "windows" or GetHost() != "windows":
+        return
 
     version = version.upper()