Changeset 846 for trunk/mkspecs/common/linux.conf
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
mkspecs/common/linux.conf (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/mkspecs/common/linux.conf
r561 r846 16 16 QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL 17 17 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL 18 QMAKE_INCDIR_OPENGL_ES1CL = $$QMAKE_INCDIR_OPENGL19 QMAKE_LIBDIR_OPENGL_ES1CL = $$QMAKE_LIBDIR_OPENGL20 18 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL 21 19 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL … … 34 32 QMAKE_LIBS_OPENGL_QT = -lGL 35 33 QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM 36 QMAKE_LIBS_OPENGL_ES1CL = -lGLES_CL37 34 QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 38 35 QMAKE_LIBS_OPENVG = -lOpenVG
Note:
See TracChangeset
for help on using the changeset viewer.
