You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.3 KiB
56 lines
1.3 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Sat, 18 Nov 2017 21:39:30 +1100
|
|
Subject: [PATCH 1/1] fixes
|
|
|
|
|
|
diff --git a/example/example.pro b/example/example.pro
|
|
index 1111111..2222222 100644
|
|
--- a/example/example.pro
|
|
+++ b/example/example.pro
|
|
@@ -1,10 +1,10 @@
|
|
TEMPLATE = app
|
|
TARGET = opencsgexample
|
|
|
|
-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
|
|
|
|
INSTALLDIR = /usr/local
|
|
INSTALLS += target
|
|
@@ -15,7 +15,8 @@ macx {
|
|
LIBS += -framework GLUT -L/opt/local/lib
|
|
}
|
|
else {
|
|
- LIBS += -lGLU -lglut
|
|
+ LIBS += -lglut
|
|
+ PKGCONFIG += glew glut
|
|
}
|
|
|
|
HEADERS = displaylistPrimitive.h
|
|
diff --git a/src/src.pro b/src/src.pro
|
|
index 1111111..2222222 100644
|
|
--- a/src/src.pro
|
|
+++ b/src/src.pro
|
|
@@ -6,10 +6,11 @@ isEmpty(INSTALLDIR) {
|
|
INSTALLDIR = /usr/local
|
|
}
|
|
|
|
-CONFIG += opengl warn_on release
|
|
+CONFIG += opengl warn_on release link_pkgconfig
|
|
INCLUDEPATH += ../include ../ $$INSTALLDIR/include
|
|
CONFIG -= qt
|
|
-LIBS += -L$$INSTALLDIR/lib -lGLEW
|
|
+LIBS += -L$$INSTALLDIR/lib
|
|
+PKGCONFIG += glew glut
|
|
|
|
DESTDIR = ../lib
|
|
headers.files = ../include/opencsg.h
|