Merge branch 'w32hooks' into develop
This commit is contained in:
commit
d0a531d093
|
@ -5,7 +5,7 @@ SET (BinPkgModules gtk+-3.0 gee-0.8 laview-core-0)
|
||||||
SET (BinCustomVapis ${CMAKE_SOURCE_DIR}/config/Config.vapi)
|
SET (BinCustomVapis ${CMAKE_SOURCE_DIR}/config/Config.vapi)
|
||||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/config")
|
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/config")
|
||||||
SET (BinInstall ON)
|
SET (BinInstall ON)
|
||||||
SET (BinExtraSources "${CMAKE_SOURCE_DIR}/res/laview-desktop.rc")
|
SET (BinExtraSources "${CMAKE_SOURCE_DIR}/res/laview-desktop.rc" w32hooks.c)
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mwindows")
|
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mwindows")
|
||||||
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
|
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-all-symbols")
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
#if defined(_WIN32) || defined(_WIN64)
|
||||||
|
#include <time.h>
|
||||||
|
struct tm *localtime_r(const time_t *timep, struct tm *result)
|
||||||
|
{
|
||||||
|
localtime_s(result, timep);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
#endif
|
Loading…
Reference in New Issue