1
0
Nicolas Winkler преди 5 години
родител
ревизия
685798613d
променени са 3 файла, в които са добавени 7 реда и са изтрити 3 реда
  1. 5 1
      Almond.pro
  2. 1 1
      MandelWidget.cpp
  3. 1 1
      libmandel/qd-2.3.22/config.h

+ 5 - 1
Almond.pro

@@ -85,7 +85,8 @@ unix:LIBS += -lm -latomic
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-20200216-8578433-win64-dev/lib/ -lavcodec
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../libs/ffmpeg-20200216-8578433-win64-dev/lib/ -lavcodec
-else:unix: LIBS += -L$$PWD/../libs/ffmpeg-4.1.1-win32-dev/lib/ -lavcodec
+else:apple: LIBS += -L/usr/local/lib -lavcodec
+else:unix: LIBS += -lavcodec
 
 win32:FFMPEGPATH = $$PWD/../libs/ffmpeg-20200216-8578433-win64-dev/lib/
 win32:INCLUDEPATH += $$PWD/../libs/ffmpeg-20200216-8578433-win64-dev/include
@@ -149,8 +150,11 @@ else:unix: LIBS += -lOpenCL
 
 win32:INCLUDEPATH += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/include'
 win32:DEPENDPATH += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/include'
+apple:INCLUDEPATH += /usr/local/Cellar/ffmpeg/4.2.2_2/include/
+apple:INCLUDEPATH += /usr/local/Cellar/boost/1.72.0_1/include/
 
 win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/lib/x86_64/libopencl.a'
 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/lib/x86_64/libopencl.a'
 else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/lib/x86_64/opencl.lib'
 else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/'../../../../../Program Files (x86)/OCL_SDK_Light/lib/x86_64/opencl.lib'
+

+ 1 - 1
MandelWidget.cpp

@@ -5,6 +5,7 @@
 using namespace mnd;
 
 #include <QPainter>
+#include <QTimer>
 
 #include <cstdio>
 
@@ -550,7 +551,6 @@ void MandelView::paint(const mnd::MandelViewport& mvp)
 
 void MandelView::cellReady(int level, GridIndex i, GridIndex j, Bitmap<RGBColor>* bmp)
 {
-
     this->getGrid(level).setCell(i, j,
         std::make_unique<GridElement>(true, std::make_shared<TextureClip>(std::make_shared<Texture>(*bmp))));
     delete bmp;

+ 1 - 1
libmandel/qd-2.3.22/config.h

@@ -31,7 +31,7 @@
 #define HAVE_FORTRAN 1
 
 /* Define to 1 if you have the <fpu_control.h> header file. */
-#define HAVE_FPU_CONTROL_H 1
+//#define HAVE_FPU_CONTROL_H 1
 
 /* Define to 1 if you have the `gettimeofday' function. */
 #define HAVE_GETTIMEOFDAY 1