Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #22 from Sarcasm/master

Fix build errors on Linux
  • Loading branch information...
commit 1810e6bb1adf254b2c2447a5a7e8431a7a82ab07 2 parents 50d9011 + 114e2cc
@dougbinks dougbinks authored
View
2  Aurora/CMakeLists.txt
@@ -89,7 +89,7 @@ if(BUILD_EXAMPLES)
endif()
else()
set_target_properties( glfw PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/External/glfw/libX11/libglfw.a )
- set(GLFW_LIBRARIES glfw X11)
+ set(GLFW_LIBRARIES glfw X11 pthread)
endif()
endif()
View
2  Aurora/Systems/LogSystem/ThreadsafeLogSystem/ThreadsafeLogSystem_PlatformWindows.cpp
@@ -29,7 +29,7 @@ typedef pthread_mutex_t CRITICAL_SECTION;
void InitializeCriticalSection( CRITICAL_SECTION* pCrit )
{
- *pCrit = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_init(pCrit, NULL);
}
void DeleteCriticalSection( CRITICAL_SECTION* pCrit )
Please sign in to comment.
Something went wrong with that request. Please try again.