SHOW:
|
|
- or go back to the newest paste.
| 1 | # HG changeset patch | |
| 2 | # User Gianfranco Costamagna <[email protected]> | |
| 3 | - | # Date 1389290215 -3600 |
| 3 | + | # Date 1389291012 -3600 |
| 4 | - | # Thu Jan 09 18:56:55 2014 +0100 |
| 4 | + | # Thu Jan 09 19:10:12 2014 +0100 |
| 5 | # Branch webgl | |
| 6 | - | # Node ID a2e87f77093cf3f0c30a51d10ff8e1733661cb6c |
| 6 | + | # Node ID 250276f4f37fc05be3b3dfd3e2acc1f309fc11a5 |
| 7 | # Parent a666e4eefd2712af123e0fb74556f8806365d45c | |
| 8 | Fixed build failure to a missing math library linked with BUILD_ENGINE_C=1 and clang | |
| 9 | ||
| 10 | - | diff -r a666e4eefd27 -r a2e87f77093c QTfrontend/CMakeLists.txt |
| 10 | + | diff -r a666e4eefd27 -r 250276f4f37f QTfrontend/CMakeLists.txt |
| 11 | - | --- a/QTfrontend/CMakeLists.txt Wed Jan 08 23:49:08 2014 +0100 |
| 11 | + | --- a/QTfrontend/CMakeLists.txt Wed Jan 08 23:49:08 2014 +0100 |
| 12 | - | +++ b/QTfrontend/CMakeLists.txt Thu Jan 09 18:56:55 2014 +0100 |
| 12 | + | +++ b/QTfrontend/CMakeLists.txt Thu Jan 09 19:10:12 2014 +0100 |
| 13 | @@ -216,7 +216,7 @@ | |
| 14 | endif() | |
| 15 | ||
| 16 | if(CMAKE_CXX_COMPILER MATCHES "clang*") | |
| 17 | - list(APPEND HW_LINK_LIBS stdc++) | |
| 18 | + list(APPEND HW_LINK_LIBS stdc++ m) | |
| 19 | endif() | |
| 20 | ||
| 21 | target_link_libraries(hedgewars ${HW_LINK_LIBS})
| |
| 22 | - | diff -r a666e4eefd27 -r a2e87f77093c project_files/hwc/rtl/CMakeLists.txt |
| 22 | + | diff -r a666e4eefd27 -r 250276f4f37f project_files/hwc/CMakeLists.txt |
| 23 | - | --- a/project_files/hwc/rtl/CMakeLists.txt Wed Jan 08 23:49:08 2014 +0100 |
| 23 | + | --- a/project_files/hwc/CMakeLists.txt Wed Jan 08 23:49:08 2014 +0100 |
| 24 | - | +++ b/project_files/hwc/rtl/CMakeLists.txt Thu Jan 09 18:56:55 2014 +0100 |
| 24 | + | +++ b/project_files/hwc/CMakeLists.txt Thu Jan 09 19:10:12 2014 +0100 |
| 25 | - | @@ -4,6 +4,7 @@ |
| 25 | + | @@ -71,6 +71,7 @@ |
| 26 | - | file(GLOB fpcrtl_src *.c) |
| 26 | + | ${GLEW_LIBRARY}
|
| 27 | physfs | |
| 28 | - | add_library(fpcrtl STATIC ${fpcrtl_src})
|
| 28 | + | physlayer |
| 29 | - | +target_link_libraries(fpcrtl m) |
| 29 | + | + m |
| 30 | #TODO: add other libraries | |
| 31 | - | #if(WEBGL) |
| 31 | + | ) |
| 32 | - | # set_target_properties(fpcrtl PROPERTIES PREFIX "em") |
| 32 | + | if(APPLE) |
