Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- added back zlib include (needed for win32).

Browse Source 
- use list append in more places.
- remove non existing include dir.
This commit is contained in:
Campbell Barton
2010-09-07 01:13:10 +00:00
parent e0aca888de
commit 2406ebe1a4
34 changed files with 105 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -309,8 +309,8 @@ IF(UNIX AND NOT APPLE)
IF(WITH_OPENMP)
LIST(APPEND LLIBS -lgomp)
LIST(APPEND CMAKE_C_FLAGS -fopenmp)
LIST(APPEND CMAKE_CXX_FLAGS -fopenmp)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
@@ -401,8 +401,7 @@ IF(WIN32)
ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
ADD_DEFINITIONS(-D__SSE__)
ADD_DEFINITIONS(-D__MMX__)
ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC)
@@ -865,8 +864,7 @@ IF(WITH_RAYOPTIMIZATION)
IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
ADD_DEFINITIONS(-D__SSE__)
ADD_DEFINITIONS(-D__MMX__)
ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")