Re: [Mingw-cross-env-list] [PATCH] Add OpenSceneGraph

[Martin Lambers]

On Wed, 20. Jan 2010, 20:41:37 +0100, Martin Lambers wrote:
> These two small changes are in the attached, updated OSG patch.

Sorry, I should have made a patch for mingw-cross-env HEAD.
See below.

Martin


diff -r 965a08983f39 src/openscenegraph-1-pkg-config.patch
--- a/src/openscenegraph-1-pkg-config.patch     Wed Jan 20 00:44:12 2010 +0100
+++ b/src/openscenegraph-1-pkg-config.patch     Wed Jan 20 20:49:53 2010 +0100
@@ -213,7 +213,7 @@
 +Requires: openscenegraph-osgParticle openscenegraph-osgWidget 
openscenegraph-osgVolume openscenegraph-osgShadow openscenegraph-osgTerrain 
openscenegraph-osgFX openscenegraph-osgSim openscenegraph-osgText 
openscenegraph-osgAnimation openscenegraph-osgViewer openscenegraph-osgDB 
openscenegraph-osgUtil openscenegraph-osg openthreads
 +Conflicts:
 +Libs:
-+Libs.private: -L${libdir}/address@hidden@ -losgdb_3dc -losgdb_3ds -losgdb_ac 
-losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds 
-losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal 
-losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive 
-losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 
-losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight 
-losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle 
-losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext 
-losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget 
-losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp 
-losgdb_stl -losgdb_svg -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans 
-losgdb_txf -losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls 
-lgcrypt -lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype 
-lgdal -ltiff -lgif -ljasper -ljpeg -liconv -lz -lws2_32 -lwinmm -lwldap32
++Libs.private: -L${libdir}/address@hidden@ -losgdb_3dc -losgdb_3ds -losgdb_ac 
-losgdb_bmp -losgdb_bsp -losgdb_bvh -losgdb_cfg -losgdb_curl -losgdb_dds 
-losgdb_dot -losgdb_dw -losgdb_dxf -losgdb_exr -losgdb_freetype -losgdb_gdal 
-losgdb_geo -losgdb_gif -losgdb_glsl -losgdb_gz -losgdb_hdr -losgdb_ive 
-losgdb_jp2 -losgdb_jpeg -losgdb_logo -losgdb_lwo -losgdb_lws -losgdb_md2 
-losgdb_mdl -losgdb_normals -losgdb_obj -losgdb_ogr -losgdb_openflight 
-losgdb_osg -losgdb_osga -losgdb_osganimation -losgdb_osgfx -losgdb_osgparticle 
-losgdb_osgshadow -losgdb_osgsim -losgdb_osgterrain -losgdb_osgtext 
-losgdb_osgtgz -losgdb_osgviewer -losgdb_osgvolume -losgdb_osgwidget 
-losgdb_pic -losgdb_pnm -losgdb_rgb -losgdb_rot -losgdb_scale -losgdb_shp 
-losgdb_stl -losgdb_tga -losgdb_tgz -losgdb_tiff -losgdb_trans -losgdb_txf 
-losgdb_txp -losgdb_vtf -losgdb_x -losgdb_zip -lcurl -lgnutls -lgcrypt 
-lgpg-error -lidn -lIlmImf -lHalf -lImath -lIlmThread -lIex -lfreetype -lgdal 
-ltiff -lgif -ljasper -ljpeg -liconv -lz -lws2_32 -lwinmm -lwldap32
 +Cflags: -I${includedir}
 diff -uNr 
OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in 
OpenSceneGraph-2.8.2/packaging/pkgconfig/openscenegraph-osgShadow.pc.in
 --- 
OpenSceneGraph-2.8.2.orig/packaging/pkgconfig/openscenegraph-osgShadow.pc.in    
   1970-01-01 01:00:00.000000000 +0100
diff -r 965a08983f39 src/openscenegraph.mk
--- a/src/openscenegraph.mk     Wed Jan 20 00:44:12 2010 +0100
+++ b/src/openscenegraph.mk     Wed Jan 20 20:49:53 2010 +0100
@@ -21,19 +21,20 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && cmake .                                   \
-        -DCMAKE_SYSTEM_NAME=Windows                        \
-        -DCMAKE_FIND_ROOT_PATH='$(PREFIX)/$(TARGET)'       \
-        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER          \
-        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY           \
-        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY           \
-        -DCMAKE_C_COMPILER='$(PREFIX)/bin/$(TARGET)-gcc'   \
-        -DCMAKE_INCLUDE_PATH='$(PREFIX)/$(TARGET)/include' \
-        -DCMAKE_LIB_PATH='$(PREFIX)/$(TARGET)/lib'         \
-        -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)'       \
-        -DCMAKE_BUILD_TYPE=Release                         \
-        -DDYNAMIC_OPENTHREADS=OFF                          \
-        -DDYNAMIC_OPENSCENEGRAPH=OFF                       \
+    cd '$(1)' && cmake .                                           \
+        -DCMAKE_SYSTEM_NAME=Windows                                \
+        -DCMAKE_FIND_ROOT_PATH='$(PREFIX)/$(TARGET)'               \
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER                  \
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY                   \
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY                   \
+        -DCMAKE_C_COMPILER='$(PREFIX)/bin/$(TARGET)-gcc'           \
+        -DCMAKE_INCLUDE_PATH='$(PREFIX)/$(TARGET)/include'         \
+        -DCMAKE_LIB_PATH='$(PREFIX)/$(TARGET)/lib'                 \
+        -DPKG_CONFIG_EXECUTABLE=$(PREFIX)/bin/$(TARGET)-pkg-config \
+        -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(TARGET)'               \
+        -DCMAKE_BUILD_TYPE=Release                                 \
+        -DDYNAMIC_OPENTHREADS=OFF                                  \
+        -DDYNAMIC_OPENSCENEGRAPH=OFF                               \
         -DBUILD_OSG_APPLICATIONS=OFF
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef