mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-01 02:36:23 -04:00
Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch
Fix Windows 7 32b Compilation from scratch.
This commit is contained in:
commit
c41f98cb4c
22 changed files with 1257 additions and 208 deletions
|
@ -37,7 +37,7 @@ win32 {
|
|||
UI_DIR = temp/ui
|
||||
|
||||
DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
||||
DEFINES += MINIUPNPC_VERSION=13
|
||||
#DEFINES += MINIUPNPC_VERSION=13
|
||||
# DESTDIR = lib
|
||||
|
||||
# Switch off optimization for release version
|
||||
|
@ -53,16 +53,16 @@ win32 {
|
|||
DEFINES += USE_CMD_ARGS
|
||||
|
||||
#miniupnp implementation files
|
||||
HEADERS += upnp/upnputil.h
|
||||
SOURCES += upnp/upnputil.c
|
||||
#HEADERS += upnp/upnputil.h
|
||||
#SOURCES += upnp/upnputil.c
|
||||
|
||||
LIBS_DIR = $$PWD/../../../libs
|
||||
|
||||
INCLUDEPATH += . $$LIBS_DIR/include $$LIBS_DIR/include/miniupnpc
|
||||
DEPENDPATH += . $$INC_DIR
|
||||
INCLUDEPATH += . $$INC_DIR
|
||||
|
||||
PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
|
||||
LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
|
||||
|
||||
LIBS += -L"$$LIBS_DIR/lib"
|
||||
for(lib, LIB_DIR):LIBS += -L"$$lib"
|
||||
for(bin, BIN_DIR):LIBS += -L"$$bin"
|
||||
LIBS += -lpthread
|
||||
}
|
||||
|
|
|
@ -89,7 +89,18 @@ linux-* {
|
|||
win32 {
|
||||
DEFINES += CURL_STATICLIB LIBXML_STATIC LIBXSLT_STATIC LIBEXSLT_STATIC
|
||||
|
||||
LIBS += -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto
|
||||
#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new'
|
||||
LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
|
||||
exists(C:/msys32/mingw32/include) {
|
||||
message(msys2 xml2 is installed.)
|
||||
INC_DIR += "C:/msys32/mingw32/include/libxml2"
|
||||
}
|
||||
exists(C:/msys64/mingw32/include) {
|
||||
message(msys2 xml2 is installed.)
|
||||
INC_DIR += "C:/msys64/mingw32/include/libxml2"
|
||||
}
|
||||
DEPENDPATH += . $$INC_DIR
|
||||
INCLUDEPATH += . $$INC_DIR
|
||||
}
|
||||
|
||||
openbsd-* {
|
||||
|
|
|
@ -105,6 +105,7 @@ void av_frame_free(AVFrame **frame)
|
|||
VideoProcessor::VideoProcessor()
|
||||
:_encoded_frame_size(640,480) , vpMtx("VideoProcessor")
|
||||
{
|
||||
//_lastTimeToShowFrame = time(NULL);
|
||||
_decoded_output_device = NULL ;
|
||||
|
||||
//_encoding_current_codec = VIDEO_PROCESSOR_CODEC_ID_JPEG_VIDEO;
|
||||
|
@ -272,7 +273,12 @@ void VideoProcessor::receiveEncodedData(const RsVOIPDataChunk& chunk)
|
|||
}
|
||||
|
||||
if(_decoded_output_device)
|
||||
// if (time(NULL) > _lastTimeToShowFrame)
|
||||
// {
|
||||
_decoded_output_device->showFrame(img) ;
|
||||
// _lastTimeToShowFrame = time(NULL) ;//+ 1000/25;
|
||||
#warning "\plugins\VOIP\gui\VideoProcessor.cpp:210 TODO: Get CPU usage to pass image."
|
||||
// }
|
||||
}
|
||||
|
||||
void VideoProcessor::setMaximumBandwidth(uint32_t bytes_per_sec)
|
||||
|
|
|
@ -102,6 +102,7 @@ class VideoProcessor
|
|||
private:
|
||||
QVideoOutputDevice *_decoded_output_device ;
|
||||
std::list<QImage> _decoded_image_queue ;
|
||||
//time_t _lastTimeToShowFrame ;
|
||||
|
||||
// =====================================================================================
|
||||
// =------------------------------------ ENCODING -------------------------------------=
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue