Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

Conflicts:
	src/vogleditor/CMakeLists.txt

diff --git a/.gitignore b/.gitignore
index 7cef4f781e40c7a5e5bcbe5582a4ac7e32d0bf8a..cf0d3c1183deb85bd732200c97ec2e918566c80e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ bin/i386/mkvogl
 bin/i386/steamlauncher
 vogl_build/*
 vogl_extbuild/*
+
+*~

diff --git a/src/voglbench/CMakeLists.txt b/src/voglbench/CMakeLists.txt
index c074e8d3f925885718fa1d76820877dcbd3ff080..db34f9202eab008330d23db21007af9574c1cda9 100644 (file)
--- a/src/voglbench/CMakeLists.txt
+++ b/src/voglbench/CMakeLists.txt
@@ -24,7 +24,6 @@ target_link_libraries(${PROJECT_NAME}
     voglcommon
     dl
     X11
-    pthread
     voglcore
     rt
     )

diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt
index 9dd0f5067048bb910df5bde3445f931b89520f44..9b6dda144666f4cbc24ed99681a2b4c14bf949d4 100644 (file)
--- a/src/voglcore/CMakeLists.txt
+++ b/src/voglcore/CMakeLists.txt
@@ -105,7 +105,10 @@ else()
 endif()
 
 add_library(${PROJECT_NAME} ${SRC_LIST})
-target_link_libraries(${PROJECT_NAME} rt)
+target_link_libraries(${PROJECT_NAME}
+    pthread
+    rt
+    )
 
 build_options_finalize()
 

diff --git a/src/vogleditor/CMakeLists.txt b/src/vogleditor/CMakeLists.txt
index e63fd93b886bcd2162023d60781572dd76b92fe2..cfccb7ee60c78787875d7d3f520bcc4f8695b8e4 100644 (file)
--- a/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@ -155,8 +155,9 @@ target_link_libraries(${PROJECT_NAME}
        ${X11_X11_LIB}
        backtrace
        voglcommon
-       voglcore
-       dl
+    voglcore
+    X11
+    dl
    )
 
 build_options_finalize()

diff --git a/src/voglgen/CMakeLists.txt b/src/voglgen/CMakeLists.txt
index 1ad4b869b168fb4b8bcbb7b62a99ded64b3a0b87..751b5ace900f6ebf47037d02268a1da5f3b5bf23 100644 (file)
--- a/src/voglgen/CMakeLists.txt
+++ b/src/voglgen/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
     voglcore
-    pthread
     )
 
 build_options_finalize()

diff --git a/src/voglsyms/CMakeLists.txt b/src/voglsyms/CMakeLists.txt
index 8fff2cd8aa7819fb4bf5a40d114c336299f93db7..e3bf2371031a0c3a181ab6b91e6ffd8ae3cfe4a7 100644 (file)
--- a/src/voglsyms/CMakeLists.txt
+++ b/src/voglsyms/CMakeLists.txt
@@ -23,7 +23,6 @@ target_link_libraries(${PROJECT_NAME}
     backtrace
     voglcommon
     dl
-    pthread
     voglcore
     rt
     )

diff --git a/src/vogltest/CMakeLists.txt b/src/vogltest/CMakeLists.txt
index cb8091beb55f24bf292bdbfd4b408b79bf1abc80..b0725b54e3a569b20635c51fa20acc2a71de2ff3 100644 (file)
--- a/src/vogltest/CMakeLists.txt
+++ b/src/vogltest/CMakeLists.txt
@@ -27,7 +27,6 @@ add_executable(${PROJECT_NAME} ${SRC_LIST})
 
 target_link_libraries(${PROJECT_NAME}
     voglcore
-    pthread
     X11
     ${VOGLTEST_OPENGL_LIBRARY}
     dl