Skip to content

Commit 7a8a478

Browse files
committed
Trying to fix Linux linking order
1 parent a85a760 commit 7a8a478

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.travis.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,16 @@ services:
5656
addons:
5757
apt:
5858
packages:
59-
- build-essential
60-
- gcc-8
61-
- g++-8
6259
- freeglut3
6360
- freeglut3-dev
61+
- libosmesa6
6462
- libglew-dev
65-
- libgl1-mesa-dev
6663
- libglu-dev
67-
- libglu1-mesa-dev
68-
- libx11-dev
6964

7065
install:
7166
- python3 -m pip install setuptools wheel scikit-build cmake glfw ninja numpy loguru pytest pytest-xdist
7267

7368
script:
74-
- export CC=gcc-8 CXX=g++-8
7569
- python3 setup.py install
7670
- |
7771
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
@@ -87,8 +81,8 @@ branches:
8781
stages:
8882
# - test
8983
- name: deploy
90-
if: repo = fbertola/bgfx-python
91-
# if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = fbertola/bgfx-python
84+
# if: repo = fbertola/bgfx-python
85+
if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = fbertola/bgfx-python
9286

9387
notifications:
9488
email: false

src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ elseif (WIN32)
7070
endforeach()
7171
else()
7272
set(DIST_COMMAND linux-release64)
73-
set(CMAKE_MODULE_LINKER_FLAGS "-lrt -ldl -lGL -lGLU -lglut -lpthread -Wl,--start-group")
73+
set(CMAKE_MODULE_LINKER_FLAGS "-lrt -ldl -lglut -lGLU -lGL -lm")
7474
endif()
7575

7676
add_library(bgfx_lib MODULE

0 commit comments

Comments
 (0)