Skip to content

Commit 9dd2567

Browse files
committed
Fix Windows build issues
1 parent d45f318 commit 9dd2567

6 files changed

Lines changed: 20 additions & 90 deletions

File tree

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ build_flags:
117117

118118
#### Clang 14
119119

120-
Bazel supports different toolchains.
120+
Bazel supports different toolchains.
121121
Usually gcc is used a C++ default compiler when using Ubuntu 22.04.
122122
But you can also easily use Clang 14 to compile Okapi.
123123

@@ -183,7 +183,7 @@ Use [Lavender](https://github.com/tmandry/lavender) to generate a solution and p
183183
python3 D:\dev\lavender\generate.py --config=vs2022 //...
184184
```
185185

186-
Lavender is far from being perfect.
186+
Lavender is far from being perfect.
187187
It might be necessary to do some modifications to the generated solution and project files.
188188

189189
### macOS
@@ -194,7 +194,7 @@ bazel build --config=clang14 //...
194194

195195
## Development process
196196

197-
I made a short video where I describe how I use test driven development to implement this project:
197+
I made a short video where I describe how I use test driven development to implement this project:
198198

199199
[![Let's Code: Using Test-driven Development to implement a ray tracer](https://img.youtube.com/vi/vFBXNr952nU/0.jpg)](https://www.youtube.com/watch?v=vFBXNr952nU)
200200

@@ -204,10 +204,10 @@ See [LICENSE.md](../LICENSE.md).
204204

205205
## Copyright notes
206206

207-
The Okapi Project makes use of several software libraries.
208-
Besides this,
209-
some source code was directly copied from other open-source software libraries or programs.
210-
This is always clearly stated as a comment in the source code of Flatland.
207+
The Okapi Project makes use of several software libraries.
208+
Besides this,
209+
some source code was directly copied from other open-source software libraries or programs.
210+
This is always clearly stated as a comment in the source code of Flatland.
211211
Additionally, some tools where copied to this repository.
212212
The corresponding licenses can be found in the Licenses folder distributed with this source code:
213213

@@ -218,7 +218,7 @@ The corresponding licenses can be found in the Licenses folder distributed with
218218
* pbrt, Version 4 (https://github.com/mmp/pbrt-v4) (concentric sampling of unit disk) ([License](licenses/pbrt-v4/LICENSE.txt))
219219
* bazel_clang_tidy (https://github.com/erenon/bazel_clang_tidy) (almost everything) ([License](licenses/bazel_clang_tidy/LICENSE))
220220
* appleseed (https://github.com/appleseedhq/appleseed)
221-
*
221+
*
222222
### Build related
223223

224224
* LLVM toolchain for Bazel (https://github.com/grailbio/bazel-toolchain) (building Flatland with LLVM) ([License](licenses/llvm_bazel_toolchain/LICENSE))
@@ -239,7 +239,7 @@ The corresponding licenses can be found in the Licenses folder distributed with
239239

240240
### Tools
241241

242-
* Bazelisk (https://github.com/bazelbuild/bazelisk) ([License](licenses/bazelisk/))
242+
* Bazelisk (https://github.com/bazelbuild/bazelisk) ([License](licenses/bazelisk/))
243243

244244
### Artwork
245245

devertexwahn/.bazelrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ build:gcc13 --cxxopt=-std=c++23
5050
build:gcc13 --cxxopt=-Wall
5151
build:gcc13 --define compiler=gcc13
5252
build:gcc13 --cxxopt=-fpermissive # Needed for fmt
53-
#build:gcc13 --noincompatible_enable_cc_toolchain_resolution # disable LLVM toolchain
54-
#build:gcc13 --@rules_cuda//cuda:copts=-allow-unsupported-compiler
53+
54+
5555

5656
# Clang 14.0.0 (config is used on Ubuntu)
5757
build:clang14 --cxxopt=-std=c++20
@@ -68,9 +68,11 @@ build:clang14 --define compiler=clang14
6868

6969
# Visual Studio 2022
7070
#build:vs2022 --copt=-DNOGDI
71+
#build:vs2022 --cxxopt=/std:c++20
7172
#build:vs2022 --host_copt=-DNOGDI
73+
74+
7275
build:vs2022 --copt=-DWIN32_LEAN_AND_MEAN
73-
#build:vs2022 --cxxopt=/std:c++20
7476
build:vs2022 --cxxopt=/std:c++latest # Support for C++23 features
7577
build:vs2022 --cxxopt=/utf-8
7678
build:vs2022 --cxxopt=/Zc:__cplusplus
@@ -79,6 +81,7 @@ build:vs2022 --define compiler=vs2022
7981
build:vs2022 --enable_runfiles # https://github.com/bazelbuild/bazel/issues/8843
8082
build:vs2022 --host_copt=-DWIN32_LEAN_AND_MEAN
8183

84+
8285
build:windows --config=vs2022
8386

8487
# Address Sanitizer

devertexwahn/MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,11 @@ local_path_override(
261261
path = "../third_party/spdlog",
262262
)
263263

264+
local_path_override(
265+
module_name = "libtiff",
266+
path = "../third_party/libtiff-4.7.1",
267+
)
268+
264269
local_path_override(
265270
module_name = "tinyobjloader",
266271
path = "../third_party/tinyobjloader",

devertexwahn/okapi/rendering/scene/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,5 @@ cc_library(
4040
"//okapi/rendering/shape:serialzied_mesh",
4141
"//okapi/rendering/shape:sphere",
4242
"//okapi/rendering/shape:triangle_mesh",
43-
#"//okapi/rendering/texture:alpha_blended_texture",
44-
#"//okapi/rendering/texture:bitmap",
45-
#"//okapi/rendering/texture:checkerboard",
4643
],
4744
)

devertexwahn/okapi/rendering/scene/scene_test.cpp

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

devertexwahn/okapi/rendering/shape/BUILD.bazel

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@ cc_library(
4343
],
4444
)
4545

46-
#cc_test(
47-
# name = "serialzied_mesh_test",
48-
# size = "small",
49-
# srcs = [
50-
# "serialized_mesh_test.cpp",
51-
# ],
52-
# data = ["//okapi/scenes"],
53-
# deps = [
54-
# ":serialzied_mesh",
55-
# "//okapi/rendering/scene:load_scene",
56-
# "@googletest//:gtest_main",
57-
# ],
58-
#)
5946

6047
cc_library(
6148
name = "sphere",

0 commit comments

Comments
 (0)