olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: restore mingw support

This commit is contained in:
Eric Wasylishen 2016-08-05 04:07:01 -04:00
parent f617d5d773
commit 292d35879b
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -29,7 +29,9 @@ find_package (Threads)
if (CMAKE_USE_PTHREADS_INIT) if (CMAKE_USE_PTHREADS_INIT)
add_definitions(-DUSE_PTHREADS) add_definitions(-DUSE_PTHREADS)
endif (CMAKE_USE_PTHREADS_INIT) elseif (CMAKE_USE_WIN32_THREADS_INIT)
add_definitions(-DUSE_WIN32THREADS)
endif ()
# (see http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/) # (see http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/)
if (MINGW) if (MINGW)
@ -40,6 +42,9 @@ if (UNIX)
add_definitions(-DLINUX) add_definitions(-DLINUX)
endif (UNIX) endif (UNIX)
set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE}) add_definitions(-DTYRUTILS_VERSION=${GIT_DESCRIBE})
#minimum version that supports unordered_map #minimum version that supports unordered_map

19
cmake/ubuntu-mingw-cross.cmake Normal file
View File

@ -0,0 +1,19 @@
# based on http://www.vtk.org/Wiki/CmakeMingw
# the name of the target operating system
SET(CMAKE_SYSTEM_NAME Windows)
# which compilers to use for C and C++
SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
# here is the target environment located
SET(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
# adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search
# programs in the host environment
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

4
common/threads.c
View File

@ -74,7 +74,7 @@ InterruptThreadProgress__(void)
* WIN32 * WIN32
* =================================================================== * ===================================================================
*/ */
#ifdef WIN32 #ifdef USE_WIN32THREADS
#define HAVE_THREADS #define HAVE_THREADS
#include <windows.h> #include <windows.h>
@ -159,7 +159,7 @@ RunThreadsOn(int start, int workcnt, void *(func)(void *), void *arg)
free(threadid); free(threadid);
} }
#endif /* WIN32 */ #endif /* USE_WIN32THREADS */
/* /*
* =================================================================== * ===================================================================

9
light/CMakeLists.txt
View File

@ -41,9 +41,12 @@ endif(embree_FOUND)
add_executable(light ${LIGHT_SOURCES}) add_executable(light ${LIGHT_SOURCES})
target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT})
set_property(TARGET light PROPERTY CXX_STANDARD 11) #set_property(TARGET light PROPERTY CXX_STANDARD 11)
set_property(TARGET light PROPERTY CXX_STANDARD_REQUIRED ON) #set_property(TARGET light PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET light PROPERTY C_STANDARD 99) #set_property(TARGET light PROPERTY C_STANDARD 99)
#set (CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
#set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
if (embree_FOUND) if (embree_FOUND)
target_link_libraries (light ${EMBREE_LIBRARY}) target_link_libraries (light ${EMBREE_LIBRARY})