From 3f837d7052214a4fbba3ec5a45c95e7236dc4d9e Mon Sep 17 00:00:00 2001 From: Nyeogmi Date: Sun, 25 Feb 2024 13:49:21 -0800 Subject: [PATCH] MORE BAZEL. VS Code only, by the way --- .clwb/.bazelproject | 17 --------------- .clwb/.blaze/modules/.project-data-dir.iml | 11 ---------- .clwb/.blaze/modules/.workspace.iml | 16 -------------- .clwb/.idea/.gitignore | 8 ------- .clwb/.idea/.name | 1 - .clwb/.idea/modules.xml | 9 -------- .clwb/.idea/runConfigurations.xml | 25 ---------------------- .clwb/.idea/vcs.xml | 7 ------ .vscode/settings.json | 5 +++++ MODULE.bazel.lock | 2 +- game/BUILD | 6 ++++++ {main => game}/device.c | 0 {main => game}/device.h | 0 {main => game}/game.c | 0 {main => game}/game.h | 0 main/BUILD | 8 ------- main/main.c | 9 -------- main/sdl_host.h | 6 ------ sdl/BUILD | 11 ++++------ sdl_host/BUILD | 5 +++++ main/sdl_host.c => sdl_host/main.c | 9 ++++---- 21 files changed, 26 insertions(+), 129 deletions(-) delete mode 100644 .clwb/.bazelproject delete mode 100644 .clwb/.blaze/modules/.project-data-dir.iml delete mode 100644 .clwb/.blaze/modules/.workspace.iml delete mode 100644 .clwb/.idea/.gitignore delete mode 100644 .clwb/.idea/.name delete mode 100644 .clwb/.idea/modules.xml delete mode 100644 .clwb/.idea/runConfigurations.xml delete mode 100644 .clwb/.idea/vcs.xml create mode 100644 .vscode/settings.json create mode 100644 game/BUILD rename {main => game}/device.c (100%) rename {main => game}/device.h (100%) rename {main => game}/game.c (100%) rename {main => game}/game.h (100%) delete mode 100644 main/BUILD delete mode 100644 main/main.c delete mode 100644 main/sdl_host.h create mode 100644 sdl_host/BUILD rename main/sdl_host.c => sdl_host/main.c (96%) diff --git a/.clwb/.bazelproject b/.clwb/.bazelproject deleted file mode 100644 index cb6ab22..0000000 --- a/.clwb/.bazelproject +++ /dev/null @@ -1,17 +0,0 @@ -directories: - # Add the directories you want added as source here - # By default, we've added your entire workspace ('.') - . - -# Automatically includes all relevant targets under the 'directories' above -derive_targets_from_directories: true - -targets: - # If source code isn't resolving, add additional targets that compile it here - -additional_languages: - # Uncomment any additional languages you want supported - # dart - # javascript - # python - # typescript diff --git a/.clwb/.blaze/modules/.project-data-dir.iml b/.clwb/.blaze/modules/.project-data-dir.iml deleted file mode 100644 index 8697667..0000000 --- a/.clwb/.blaze/modules/.project-data-dir.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.clwb/.blaze/modules/.workspace.iml b/.clwb/.blaze/modules/.workspace.iml deleted file mode 100644 index 35d4f8d..0000000 --- a/.clwb/.blaze/modules/.workspace.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.clwb/.idea/.gitignore b/.clwb/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.clwb/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.clwb/.idea/.name b/.clwb/.idea/.name deleted file mode 100644 index a4ebd44..0000000 --- a/.clwb/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -CrocParty \ No newline at end of file diff --git a/.clwb/.idea/modules.xml b/.clwb/.idea/modules.xml deleted file mode 100644 index 6e46a2e..0000000 --- a/.clwb/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.clwb/.idea/runConfigurations.xml b/.clwb/.idea/runConfigurations.xml deleted file mode 100644 index e507a04..0000000 --- a/.clwb/.idea/runConfigurations.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.clwb/.idea/vcs.xml b/.clwb/.idea/vcs.xml deleted file mode 100644 index 62bd7a0..0000000 --- a/.clwb/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..20d5904 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "stdbool.h": "c" + } +} \ No newline at end of file diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 448dc9a..95bd134 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "0e3e315145ac7ee7a4e0ac825e1c5e03c068ec1254dd42c3caaecb27e921dc4d", + "moduleFileHash": "26410c1d586b610379d5f0071d4dd5919188e0ec421ce4608d07c972ac622678", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" diff --git a/game/BUILD b/game/BUILD new file mode 100644 index 0000000..c36d3f6 --- /dev/null +++ b/game/BUILD @@ -0,0 +1,6 @@ +cc_library( + name = "game", + srcs = glob(["*.c"]), + hdrs = glob(["*.h"]), + visibility = ["//sdl_host:__pkg__"] +) diff --git a/main/device.c b/game/device.c similarity index 100% rename from main/device.c rename to game/device.c diff --git a/main/device.h b/game/device.h similarity index 100% rename from main/device.h rename to game/device.h diff --git a/main/game.c b/game/game.c similarity index 100% rename from main/game.c rename to game/game.c diff --git a/main/game.h b/game/game.h similarity index 100% rename from main/game.h rename to game/game.h diff --git a/main/BUILD b/main/BUILD deleted file mode 100644 index 8df1e41..0000000 --- a/main/BUILD +++ /dev/null @@ -1,8 +0,0 @@ -cc_binary( - name = "game", - srcs = glob([ - "*.c", - "*.h", - ]), - deps = ["//sdl"], -) diff --git a/main/main.c b/main/main.c deleted file mode 100644 index 7f4fdad..0000000 --- a/main/main.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "sdl_host.h" - -int main() { - // PYREX NOTE: You could, if you wanted, define another host with the same interface as sdl_host - // That would be pretty cool, right? - // - // (Such a host might be smaller and more platform-specific.) - return sdl_host_main(); -} diff --git a/main/sdl_host.h b/main/sdl_host.h deleted file mode 100644 index 4b5bec9..0000000 --- a/main/sdl_host.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef CROCPARTY_SDL_HOST_H -#define CROCPARTY_SDL_HOST_H - -int sdl_host_main(void); - -#endif //CROCPARTY_SDL_HOST_H diff --git a/sdl/BUILD b/sdl/BUILD index 6708ff3..d1d0894 100644 --- a/sdl/BUILD +++ b/sdl/BUILD @@ -1,10 +1,7 @@ -cc_library( +cc_import( name = "sdl", - srcs = [ - "x64_windows/SDL2.dll", - "x64_windows/SDL2.lib", - "x64_windows/SDL2main.lib", - ], hdrs = glob(["include/*.h"]), - visibility = ["//main:__pkg__"], + interface_library = "x64_windows/SDL2.lib", + shared_library = "x64_windows/SDL2.dll", + visibility = ["//sdl_host:__pkg__"], ) diff --git a/sdl_host/BUILD b/sdl_host/BUILD new file mode 100644 index 0000000..a860225 --- /dev/null +++ b/sdl_host/BUILD @@ -0,0 +1,5 @@ +cc_binary( + name = "sdl_host", + srcs = glob(["*.c", "*.h"]), + deps = ["//game:game", "//sdl:sdl"], +) \ No newline at end of file diff --git a/main/sdl_host.c b/sdl_host/main.c similarity index 96% rename from main/sdl_host.c rename to sdl_host/main.c index 911e9c3..d7fa043 100644 --- a/main/sdl_host.c +++ b/sdl_host/main.c @@ -1,10 +1,11 @@ #include #include -#include "sdl_host.h" +// don't use sdl's redefinition of main +#define SDL_MAIN_HANDLED #include "sdl/include/SDL.h" -#include "game.h" -#include "device.h" +#include "game/game.h" +#include "game/device.h" void sdl_host_suggest_dimensions(uint32_t* window_w, uint32_t* window_h); void sdl_host_loop(); @@ -13,7 +14,7 @@ SDL_Window* sdl_host_window; SDL_Renderer* sdl_host_renderer; SDL_Texture* sdl_host_target; -int sdl_host_main(void) { +int main(int argc, char** argv) { int result = 0; if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER)) { printf("could not initialize SDL! sdl error: %s\n", SDL_GetError());