diff --git a/SConstruct b/SConstruct
index e45769fac1..640494ac01 100644
--- a/SConstruct
+++ b/SConstruct
@@ -85,7 +85,6 @@ if sys.platform == 'darwin':
             for dstNode in target:
                 writePlist(properties, str(dstNode))
     builders['Plist'] = Builder(action = createPlist)
-    compileFlags += [ '-I/opt/local/include' ]
 
 if sys.platform == 'win32':
     env_home = os.environ['USERPROFILE']
@@ -213,28 +212,18 @@ if sys.platform == 'darwin':
 env['HAVE_SDL'] = conf.CheckSDL('1.0.0')
 
 # Bluetooth for wii support
-if sys.platform == 'win32':
-    env['HAVE_BLUEZ'] = 0
-else:
-    env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
+env['HAVE_BLUEZ'] = conf.CheckPKG('bluez')
 
 # needed for sound
-if sys.platform == 'win32':
-    env['HAVE_AO'] = 0
-else:
-    env['HAVE_AO'] = conf.CheckPKG('ao')
+env['HAVE_AO'] = conf.CheckPKG('ao')
 
 # needed for mic
-if sys.platform == 'win32':
-    env['HAVE_PORTAUDIO'] = 0
-else:
-    env['HAVE_PORTAUDIO'] =  conf.CheckPortaudio(1890)
+env['HAVE_PORTAUDIO'] =  conf.CheckPortaudio(1890)
 
 # sfml
 env['HAVE_SFML'] = 0
-if sys.platform != 'win32':
-    if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"):
-        env['HAVE_SFML'] = 1;
+if conf.CheckPKG('sfml') and conf.CheckCHeader("SFML/Audio.hpp"):
+    env['HAVE_SFML'] = 1;
 
 #osx 64 specifics
 if sys.platform == 'darwin':
@@ -246,9 +235,7 @@ if sys.platform == 'darwin':
     if not env['osx'] == '32x11':
         env['HAVE_X11'] = 0
         env['HAVE_COCOA'] = 1
-elif sys.platform == 'win32':
-    env['HAVE_X11'] = 0
-    env['HAVE_COCOA'] = 0
+
 else:
     env['HAVE_X11'] = conf.CheckPKG('x11')
     env['HAVE_COCOA'] = 0
diff --git a/SconsTests/utils.py b/SconsTests/utils.py
index 513d74f62b..a04b5be967 100644
--- a/SconsTests/utils.py
+++ b/SconsTests/utils.py
@@ -89,6 +89,8 @@ def ConfigPKG(context, name):
     
 def CheckPKG(context, name):
     context.Message( 'Checking for %s... ' % name )
+    if platform.system().lower() == 'windows':
+        return 0 
     ret = 1
     if not CheckFramework(context, name):
         if not ConfigPKG(context, name.lower()):
@@ -101,6 +103,8 @@ def CheckPKG(context, name):
 
 def CheckSDL(context, version):
     context.Message( 'Checking for sdl lib version > %s... ' % version)
+    if platform.system().lower() == 'windows':
+        return 1
     sdl_config = context.env.WhereIs('sdl-config')
     if sdl_config == None:
         ret = 0
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 773b3a8aa0..5ba4d67823 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -51,7 +51,7 @@ else:
 if gfxenv['HAVE_WX']:
 	files += [
                 'GUI/ConfigDlg.cpp',
-				'Debugger/Debugger.cpp',
+		'Debugger/Debugger.cpp',
                 ]
 
 if gfxenv['HAVE_COCOA']:
@@ -60,36 +60,45 @@ if gfxenv['HAVE_COCOA']:
                 '-x',
                 'objective-c++',
                 ]
-        
+
 tests = {'CheckPKG' : utils.CheckPKG}
 conf = gfxenv.Configure(custom_tests = tests,
                         config_h=env['base_dir']+"Source/Core/Common/Src/Config.h")
 
 if sys.platform == 'darwin':
+	
+	conf.CheckPKG('OpenGL')
+	if not conf.CheckPKG('Cg'):
+		print name + " must have Cg framework from nvidia to be build"
+		Return()
 
-    # Use libraries from MacPorts.
-    compileFlags.append('-I/opt/local/include')
-    linkFlags.append('-L/opt/local/lib')
-    conf.CheckPKG('OpenGL')
-    if not conf.CheckPKG('Cg'):
-        print name + " must have Cg framework from nvidia to be build"
-        Return()
 elif sys.platform == 'win32':
         print name + " is assuming that you have opengl, glu, cg, and cggl"
 else:
         if not (conf.CheckPKG('GL') and conf.CheckPKG('GLU')):
                 print name + " must have opengl and glu to be build"
                 Return()
-
-        if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'):
+	
+	if not conf.CheckPKG('Cg') or not conf.CheckPKG('CgGL'):
                 print name + " must have cg and cggl to be build"
                 Return()
 if sys.platform == 'win32':
-    print name + " is assuming that you have glew"
+	print name + " is assuming that you have glew"
 else:
-    if not conf.CheckPKG('GLEW'):
-        print name + " must have glew to be build"
-        Return()
+	if not conf.CheckPKG('GLEW'):
+		print name + " must have glew to be build"
+		Return()
+
+
+if sys.platform == 'win32':
+	files += [
+		'OS/Win32.cpp'
+		]
+	libs += [
+		env['base_dir'] + '/Externals/Cg/'
+		]	
+	gfxenv['CPPPATH'] += libs
+	
 
 # check for xxf86vm
 
@@ -128,8 +137,7 @@ gfxenv.Append(
 	LINKFLAGS = linkFlags,
 	)
 
-if sys.platform != 'win32':
-    gfxenv.SharedLibrary(
+gfxenv.SharedLibrary(
 	env['plugin_dir']+name,
 	files,
 	LIBS =  libs + gfxenv['LIBS']