diff --git a/demo/c++/README.md b/demo/c++/README.md
index 77e071a15..187133d96 100644
--- a/demo/c++/README.md
+++ b/demo/c++/README.md
@@ -37,8 +37,14 @@ To install gyp, which is pure python do:
 
     svn checkout http://gyp.googlecode.com/svn/trunk/ gyp
     cd gyp
-    sudo python setup.py install
+    python setup.py install
 
+If you do not have svn installed you can grab gyp from:
+
+    https://github.com/TooTallNate/node-gyp/archive/master.zip
+    # unzip and extract the 'gyp' subfolder then do
+    cd gyp
+    python setup.py install
 
 ## Building the demo
 
diff --git a/demo/c++/rundemo.gyp b/demo/c++/rundemo.gyp
index 559b39363..373374f98 100644
--- a/demo/c++/rundemo.gyp
+++ b/demo/c++/rundemo.gyp
@@ -1,12 +1,5 @@
 {
   'includes': [ 'common.gypi' ],
-  'include_dirs': [
-     '<!@(mapnik-config --includes)',
-     '<!@(mapnik-config --dep-includes)',
-  ],
-  'defines': [
-     '<!@(mapnik-config --defines)',
-  ],
   'targets': [
     {
       'target_name': 'rundemo',
@@ -29,6 +22,17 @@
           }
         }],
         [ 'OS=="win"', {
+            'defines': [
+               '<!@(mapnik-config --defines)',
+            ],
+            'libraries': [
+                '<!@(mapnik-config --libs)',
+                 '<!@(mapnik-config --dep-libs)'
+            ],
+            'include_dirs': [
+               '<!@(mapnik-config --includes)',
+               '<!@(mapnik-config --dep-includes)',
+            ],
             'msvs_settings': {
                'AdditionalLibraryDirectories': [
                   '<!@(mapnik-config --ldflags)'