From 0ab30d953d0828fc76407edb866e7b280d938858 Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Sun, 2 Dec 2018 21:06:11 -0200 Subject: [PATCH 1/3] Fixes rendering issue that occurred in some Linux distros. --- internal/c/libqb.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/c/libqb.cpp b/internal/c/libqb.cpp index d08337529..f1f10c3ef 100644 --- a/internal/c/libqb.cpp +++ b/internal/c/libqb.cpp @@ -27519,8 +27519,13 @@ int main( int argc, char* argv[] ){ #endif - glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); + #ifdef QB64_WINDOWS + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); + #else + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); + #endif + glutInitWindowSize(640,400);//cannot be changed unless display_x(etc) are modified //glutInitWindowPosition(300, 200); From 0f6f16e51ae191eaf7cbb3dd501ced6739fd363e Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Sun, 2 Dec 2018 21:06:30 -0200 Subject: [PATCH 2/3] Adds -no-pie switch to g++ makeline (Linux). --- internal/c/makeline_lnx.txt | 2 +- setup_lnx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/c/makeline_lnx.txt b/internal/c/makeline_lnx.txt index 24a94a34d..3be629a21 100644 --- a/internal/c/makeline_lnx.txt +++ b/internal/c/makeline_lnx.txt @@ -1,2 +1,2 @@ -g++ -w qbx.cpp parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o +g++ -no-pie -w qbx.cpp parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o diff --git a/setup_lnx.sh b/setup_lnx.sh index d0dfd3d18..a41a3d979 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -192,7 +192,7 @@ else echo "Building 'QB64'" cp -r ./internal/source/* ./internal/temp/ cd internal/c - g++ -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o ../../qb64 + g++ -no-pie -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o ../../qb64 cd ../.. fi From 775e99b7ab83cdb5b0bf81469b44534797206284 Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Sun, 2 Dec 2018 21:28:39 -0200 Subject: [PATCH 3/3] Removes -no-pie switch as it breaks autobuilds... /sigh --- internal/c/makeline_lnx.txt | 2 +- setup_lnx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/c/makeline_lnx.txt b/internal/c/makeline_lnx.txt index 3be629a21..24a94a34d 100644 --- a/internal/c/makeline_lnx.txt +++ b/internal/c/makeline_lnx.txt @@ -1,2 +1,2 @@ -g++ -no-pie -w qbx.cpp parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o +g++ -w qbx.cpp parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o diff --git a/setup_lnx.sh b/setup_lnx.sh index a41a3d979..d0dfd3d18 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -192,7 +192,7 @@ else echo "Building 'QB64'" cp -r ./internal/source/* ./internal/temp/ cd internal/c - g++ -no-pie -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o ../../qb64 + g++ -w qbx.cpp libqb/os/lnx/libqb_setup.o parts/video/font/ttf/os/lnx/src.o parts/core/os/lnx/src.a -lGL -lGLU -lX11 -lpthread -ldl -lrt -D FREEGLUT_STATIC -o ../../qb64 cd ../.. fi