BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Build fixes

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-24 11:18:30 -05:00
parent 2e74af9555
commit 29d370d63a
3 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
3rd_party/CEF/create.cmd vendored
View File

@@ -42,18 +42,6 @@ if not exist "%MODE%.complete" (
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libEGL.dll bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libGLESv2.dll bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\d3dcompiler_47.dll bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libcef.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\chrome_elf.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\osmesa.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libEGL.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libGLESv2.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\obj\cef\libcef_dll_wrapper_cc.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\icudtl.dat bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\cef.pak bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\*.bin bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\cef_*.pak bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libcef.dll.lib lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\chrome_elf.dll.lib lib\%MODE%\
@@ -61,9 +49,29 @@ if not exist "%MODE%.complete" (
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libEGL.dll.lib lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libGLESv2.dll.lib lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\obj\cef\libcef_dll_wrapper.lib lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libcef.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\chrome_elf.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\osmesa.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libEGL.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libGLESv2.dll.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\obj\cef\libcef_dll_wrapper_cc.pdb bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libcef.dll.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\chrome_elf.dll.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\osmesa.dll.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libEGL.dll.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\libGLESv2.dll.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\obj\cef\libcef_dll_wrapper_cc.pdb lib\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\icudtl.dat bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\cef.pak bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\*.bin bin\%MODE%\
copy /y chromium_git\chromium\src\out\%MODE%_GN_x64\cef_*.pak bin\%MODE%\
echo "Cleaning build output... Please wait..."
rd /s /q chromium_git\chromium\src\out\
rd /s /q chromium_git\chromium\src\out\%MODE%_GN_x64
rd /s /q chromium_git\chromium\src\out\%MODE%_GN_x86
echo "1">%MODE%.complete
)

4
src/siadrive_api/debugconsumer.cpp
View File

@@ -14,6 +14,10 @@ CDebugConsumer::~CDebugConsumer()
void CDebugConsumer::ProcessEvent(const CEvent& eventData)
{
#ifdef _WIN32
OutputDebugString(eventData.GetSingleLineMessage().str().c_str());
OutputDebugString(L"\n");
#else
a
#endif
}

10
src/siadrive_api/eventsystem.cpp
View File

@@ -7,6 +7,8 @@ CEventSystem CEventSystem::EventSystem;
CEventSystem::CEventSystem() :
#ifdef _WIN32
_stopEvent(INVALID_HANDLE_VALUE)
#else
a
#endif
{
}
@@ -17,7 +19,7 @@ CEventSystem::~CEventSystem()
#ifdef _WIN32
::CloseHandle(_stopEvent);
#else
a
#endif
}
@@ -52,7 +54,7 @@ void CEventSystem::ProcessEvents()
} while (eventData);
}
#else
a
#endif
}
@@ -80,7 +82,7 @@ void CEventSystem::Start()
#ifdef _WIN32
_stopEvent = ::CreateEvent(nullptr, FALSE, FALSE, nullptr);
#else
a
#endif
_processThread.reset(new std::thread([this]() {ProcessEvents(); }));
}
@@ -93,7 +95,7 @@ void CEventSystem::Stop()
#ifdef _WIN32
::SetEvent(_stopEvent);
#else
a
#endif
_processThread->join();
_processThread.reset();