Skip to content

Commit

Permalink
Merge branch 'main' of github.com:stergiotis/imzero_client_cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
stergiotis committed Jun 6, 2024
2 parents 8e6f856 + 67b4494 commit 2dc2dba
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 33 deletions.
1 change: 0 additions & 1 deletion imgui_glfw/Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions imgui_glfw/build_ab_initio.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
set -ev
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
cd "$here"

source /etc/os-release

#../scripts/install.sh
#../scripts/install_nonportable.sh
./build_flatbuffers.sh
./build.sh
13 changes: 10 additions & 3 deletions imgui_glfw/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
set -ev
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
cd "$here"
./make.dhall
make clean
make -j
flatc="../../contrib/flatbuffers/flatc"
"$flatc" -o imgui --cpp imgui/vectorCmd.fbs

./cmakelists.dhall

mkdir -p build
cd build
cmake ../CMakeLists.txt
cmake --build . -j
mv *_exe ..
6 changes: 6 additions & 0 deletions imgui_glfw/build_flatbuffers.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
here=$(dirname "$(readlink -f "$BASH_SOURCE")")
set -ev
cd ../../contrib/flatbuffers
cmake -G "Unix Makefiles"
make -j
15 changes: 15 additions & 0 deletions imgui_glfw/cmakelists.dhall
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/usr/bin/env -S dhall text --output CMakeLists.txt --file
let prelude = ../dhall/prelude.dhall
let lib = ../dhall/lib.dhall
let cmake = ../dhall/cmakelists.dhall
let sourceTreePartsRepo = ../dhall/sourceTreeParts.dhall
let common = ./common.dhall
in
cmake.cmakelistsToText cmake.cmakelists::{
, cxx = common.cxx
, exe = "imgui_exe"
, projectName = "imgui_exe"
, cxxflags = ["-std=c++${Natural/show common.cppstd}" ] # common.cxxflags # common.stdlibFlags
, ldflags = common.ldflags # common.stdlibFlags
, sourceTreeParts = common.sourceTreeParts
}
33 changes: 29 additions & 4 deletions imgui_glfw/common.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,34 @@ let sourceTreeParts = [
, mainPart
]
let cxx = "clang++"
let cppstd = "c++20"
let cppstd = 20
let cxxflagsDebug = [
, "-g"
, "-gdwarf-4"
, "-Wall"
, "-Wformat"
, "-Wextra"
, "-O1"
, "-fsanitize=address"
, "-fno-omit-frame-pointer"
, "-DIMZERO_DEBUG_BUILD"
--, "-fno-optimize-sibling-calls" -- no tail calls for better stacktraces
]
let cxxflagsRelease = [
, "-O3"
]
let ldflagsDebug = ["-fsanitize=address"] : List Text
let ldflagsRelease = ["-DNDEBUG"] : List Text
--let stdlibFlags = ["-stdlib=libc++"] : List Text
let stdlibFlags = [] : List Text
let debug = False
in {
, sourceTreeParts
, cxx
, cppstd
, sourceTreeParts
, cxx
, cppstd
, cxxflags = if debug then cxxflagsDebug else cxxflagsRelease
, ldflags = if debug then ldflagsDebug else ldflagsRelease
, stdlibFlags
, debug
}

25 changes: 0 additions & 25 deletions imgui_glfw/make.dhall

This file was deleted.

1 change: 1 addition & 0 deletions scripts/install_3rd_party_git_repos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ getContribRepo "https://github.com/stergiotis/imgui_toggle.git" "imgui_toggle" "
getContribRepo "https://github.com/dhall-lang/dhall-lang" "dhall-lang" "master" "v22.0.0"
getContribRepo "https://github.com/google/flatbuffers.git" "flatbuffers" "master" "129ef422e8a4e89d87a7216a865602673a6d0bf3"
getContribRepo "https://github.com/google/skia" "skia" "chrome/m123" ""
getContribRepo "https://github.com/wolfpld/tracy" "tracy" "master" "0d5bd53be393b590da9c7b29079d919d488412c1"
getMyRepo "https://github.com/stergiotis/boxer.git" "boxer" "main" ""

0 comments on commit 2dc2dba

Please sign in to comment.