mxe/src/opencsg-1-fixes.patch

48 lines
1.3 KiB
Diff
Raw Normal View History

This file is part of MXE. See LICENSE.md for licensing information.
2011-10-22 00:36:24 +01:00
Contains ad hoc patches for cross building.
diff -ur OpenCSG-1.4.1.orig/example/example.pro OpenCSG-1.4.1/example/example.pro
--- OpenCSG-1.4.1.orig/example/example.pro 2016-09-08 23:08:33.000000000 +0200
+++ OpenCSG-1.4.1/example/example.pro 2016-09-11 14:24:18.839741352 +0200
2015-03-22 13:12:03 +00:00
@@ -1,10 +1,10 @@
TEMPLATE = app
TARGET = opencsgexample
2011-10-22 00:36:24 +01:00
2015-03-22 13:12:03 +00:00
-CONFIG += opengl warn_on release
+CONFIG += opengl warn_on release link_pkgconfig
CONFIG -= qt
INCLUDEPATH += ../include
-LIBS += -L../lib -lopencsg -lGLEW
+LIBS += -L../lib -lopencsg
2011-10-22 00:36:24 +01:00
2015-03-22 13:12:03 +00:00
INSTALLDIR = /usr/local
INSTALLS += target
@@ -15,7 +15,8 @@
LIBS += -framework GLUT -L/opt/local/lib
}
else {
- LIBS += -lGLU -lglut
+ LIBS += -lglut
+ PKGCONFIG += glew glut
}
2011-10-22 00:36:24 +01:00
2015-03-22 13:12:03 +00:00
HEADERS = displaylistPrimitive.h
diff -ur OpenCSG-1.4.1.orig/src/src.pro OpenCSG-1.4.1/src/src.pro
--- OpenCSG-1.4.1.orig/src/src.pro 2016-09-08 23:08:33.000000000 +0200
+++ OpenCSG-1.4.1/src/src.pro 2016-09-11 14:25:15.833496135 +0200
@@ -6,10 +6,11 @@
INSTALLDIR = /usr/local
}
2011-10-22 00:36:24 +01:00
2015-03-22 13:12:03 +00:00
-CONFIG += opengl warn_on release
+CONFIG += opengl warn_on release link_pkgconfig
INCLUDEPATH += ../include ../ $$INSTALLDIR/include
2015-03-22 13:12:03 +00:00
CONFIG -= qt
-LIBS += -L$$INSTALLDIR/lib -lGLEW
+LIBS += -L$$INSTALLDIR/lib
2015-03-22 13:12:03 +00:00
+PKGCONFIG += glew glut
2011-10-22 00:36:24 +01:00
2015-03-22 13:12:03 +00:00
DESTDIR = ../lib
headers.files = ../include/opencsg.h