commit 7eb492e83958a6548aaeef2a0583d14131dcfb82
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 25 17:41:34 2011 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 25 17:41:34 2011 +0000
tree b42707c9ef30c0dbaa0aa1ba00d2933a480eb3c4
parent 7ff8d81290c3d9d461f2e304f4fd7846275f956d

Add the GLU tesselator source files to third_party.  Add a libtess static
library build target to the .gyp file (not required by any executable yet).  Fix
some build errors with SampleApp on Linux and Win32.  Add a gyp_skia python
script which invokes gyp with the correct arguments, and is recursively callable
by the Makefile when skia.gyp is changed.

Review URL:  http://codereview.appspot.com/4280069/



git-svn-id: http://skia.googlecode.com/svn/trunk@1007 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/skia.gyp

diff --git a/gyp/skia.gyp b/gyp/skia.gyp
index 20b5fae..d4bb4d0 100644
--- a/gyp/skia.gyp
+++ b/gyp/skia.gyp
@@ -299,6 +299,7 @@
           'link_settings': {
             'libraries': [
               '-lfreetype',
+              '-lpthread',
             ],
           },
         }],
@@ -728,7 +729,7 @@
         [ 'OS == "win"', {
           'sources': [
             '../src/utils/win/SkOSWindow_Win.cpp',
-            '../vs/SampleApp/skia_win.cpp',
+            '../src/utils/win/skia_win.cpp',
           ],
         },],
         [ 'OS == "mac"', {
@@ -1417,13 +1418,52 @@
           'SubSystem': '2',
           'AdditionalDependencies': [
               'OpenGL32.lib',
-              'glew32.lib',
               'usp10.lib',
               'd3d9.lib',
           ],
         },
       },
     },
+    {
+      'target_name': 'libtess',
+      'type': 'static_library',
+      'include_dirs': [
+        '../third_party/glu',
+      ],
+      'sources': [
+        '../third_party/glu/internal_glu.h',
+        '../third_party/glu/gluos.h',
+        '../third_party/glu/libtess/dict-list.h',
+        '../third_party/glu/libtess/dict.c',
+        '../third_party/glu/libtess/dict.h',
+        '../third_party/glu/libtess/geom.c',
+        '../third_party/glu/libtess/geom.h',
+        '../third_party/glu/libtess/memalloc.c',
+        '../third_party/glu/libtess/memalloc.h',
+        '../third_party/glu/libtess/mesh.c',
+        '../third_party/glu/libtess/mesh.h',
+        '../third_party/glu/libtess/normal.c',
+        '../third_party/glu/libtess/normal.h',
+        '../third_party/glu/libtess/priorityq-heap.c',
+        '../third_party/glu/libtess/priorityq-heap.h',
+        '../third_party/glu/libtess/priorityq-sort.h',
+        '../third_party/glu/libtess/priorityq.c',
+        '../third_party/glu/libtess/priorityq.h',
+        '../third_party/glu/libtess/render.c',
+        '../third_party/glu/libtess/render.h',
+        '../third_party/glu/libtess/sweep.c',
+        '../third_party/glu/libtess/sweep.h',
+        '../third_party/glu/libtess/tess.c',
+        '../third_party/glu/libtess/tess.h',
+        '../third_party/glu/libtess/tessmono.c',
+        '../third_party/glu/libtess/tessmono.h',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/glu',
+        ],
+      },
+    },
   ],
 }