Skip to content

Commit 2dc2dba

Browse files
committed
Merge branch 'main' of github.com:stergiotis/imzero_client_cpp
2 parents 8e6f856 + 67b4494 commit 2dc2dba

File tree

8 files changed

+72
-33
lines changed

8 files changed

+72
-33
lines changed

imgui_glfw/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

imgui_glfw/build_ab_initio.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
set -ev
3+
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
4+
cd "$here"
5+
6+
source /etc/os-release
7+
8+
#../scripts/install.sh
9+
#../scripts/install_nonportable.sh
10+
./build_flatbuffers.sh
11+
./build.sh

imgui_glfw/build_cpp.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
set -ev
33
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
44
cd "$here"
5-
./make.dhall
6-
make clean
7-
make -j
5+
flatc="../../contrib/flatbuffers/flatc"
6+
"$flatc" -o imgui --cpp imgui/vectorCmd.fbs
7+
8+
./cmakelists.dhall
9+
10+
mkdir -p build
11+
cd build
12+
cmake ../CMakeLists.txt
13+
cmake --build . -j
14+
mv *_exe ..

imgui_glfw/build_flatbuffers.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
3+
set -ev
4+
cd ../../contrib/flatbuffers
5+
cmake -G "Unix Makefiles"
6+
make -j

imgui_glfw/cmakelists.dhall

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env -S dhall text --output CMakeLists.txt --file
2+
let prelude = ../dhall/prelude.dhall
3+
let lib = ../dhall/lib.dhall
4+
let cmake = ../dhall/cmakelists.dhall
5+
let sourceTreePartsRepo = ../dhall/sourceTreeParts.dhall
6+
let common = ./common.dhall
7+
in
8+
cmake.cmakelistsToText cmake.cmakelists::{
9+
, cxx = common.cxx
10+
, exe = "imgui_exe"
11+
, projectName = "imgui_exe"
12+
, cxxflags = ["-std=c++${Natural/show common.cppstd}" ] # common.cxxflags # common.stdlibFlags
13+
, ldflags = common.ldflags # common.stdlibFlags
14+
, sourceTreeParts = common.sourceTreeParts
15+
}

imgui_glfw/common.dhall

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,34 @@ let sourceTreeParts = [
2323
, mainPart
2424
]
2525
let cxx = "clang++"
26-
let cppstd = "c++20"
26+
let cppstd = 20
27+
let cxxflagsDebug = [
28+
, "-g"
29+
, "-gdwarf-4"
30+
, "-Wall"
31+
, "-Wformat"
32+
, "-Wextra"
33+
, "-O1"
34+
, "-fsanitize=address"
35+
, "-fno-omit-frame-pointer"
36+
, "-DIMZERO_DEBUG_BUILD"
37+
--, "-fno-optimize-sibling-calls" -- no tail calls for better stacktraces
38+
]
39+
let cxxflagsRelease = [
40+
, "-O3"
41+
]
42+
let ldflagsDebug = ["-fsanitize=address"] : List Text
43+
let ldflagsRelease = ["-DNDEBUG"] : List Text
44+
--let stdlibFlags = ["-stdlib=libc++"] : List Text
45+
let stdlibFlags = [] : List Text
46+
let debug = False
2747
in {
28-
, sourceTreeParts
29-
, cxx
30-
, cppstd
48+
, sourceTreeParts
49+
, cxx
50+
, cppstd
51+
, cxxflags = if debug then cxxflagsDebug else cxxflagsRelease
52+
, ldflags = if debug then ldflagsDebug else ldflagsRelease
53+
, stdlibFlags
54+
, debug
3155
}
56+

imgui_glfw/make.dhall

Lines changed: 0 additions & 25 deletions
This file was deleted.

scripts/install_3rd_party_git_repos.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,5 @@ getContribRepo "https://github.com/stergiotis/imgui_toggle.git" "imgui_toggle" "
5050
getContribRepo "https://github.com/dhall-lang/dhall-lang" "dhall-lang" "master" "v22.0.0"
5151
getContribRepo "https://github.com/google/flatbuffers.git" "flatbuffers" "master" "129ef422e8a4e89d87a7216a865602673a6d0bf3"
5252
getContribRepo "https://github.com/google/skia" "skia" "chrome/m123" ""
53+
getContribRepo "https://github.com/wolfpld/tracy" "tracy" "master" "0d5bd53be393b590da9c7b29079d919d488412c1"
5354
getMyRepo "https://github.com/stergiotis/boxer.git" "boxer" "main" ""

0 commit comments

Comments
 (0)