blob: d6000d1a76db58bb7598e03637689175add2e63e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
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
|
