From 524432970b5aaee6e6dbc6162111dbe1e9fd0749 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Patrick=20Sch=C3=B6nberger?= Date: Wed, 20 Jan 2021 12:53:28 +0100 Subject: [PATCH] fix build.sh --- build.sh | 3 ++- src/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 3c921c8..a065433 --- a/build.sh +++ b/build.sh @@ -1 +1,2 @@ -g++ src/main.cpp -o main -lsfml-system -lsfml-window -lGLEW -lGL -lassimp +# g++ -c ~/cpp/libs/imgui/*.cpp ~/cpp/libs/imgui-sfml/*.cpp -I ~/cpp/libs/imgui -I ~/cpp/libs/imgui-sfml/ +g++ src/main.cpp ./*.o -o main -I ~/cpp/libs/imgui -I ~/cpp/libs/imgui-sfml -lsfml-system -lsfml-window -lsfml-graphics -lGLEW -lGL -lassimp diff --git a/src/main.cpp b/src/main.cpp index 1440f04..b95cc97 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -389,7 +389,7 @@ int main() { ImGui::Begin("Options"); ImGui::Checkbox("Wireframe", &options.wireframe); - ImGui::Checkbox("Free Cam (F)", &options.freecam); + ImGui::Checkbox("Free Cam", &options.freecam); if (options.freecam) { ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z); ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y); @@ -413,4 +413,4 @@ int main() { } return 0; -} \ No newline at end of file +} -- 2.50.1