Skip to content

Update and cleanup headers #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RandyGaul merged 4 commits into from
Mar 1, 2026
Merged

Update and cleanup headers #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8700e35
Cleanup include guards
pusewicz Feb 28, 2026
41d83ef
Add missing include
pusewicz Feb 28, 2026
0ef150c
Use double-quotes for local includes
pusewicz Feb 28, 2026
ae24ee6
Fix haptics header
pusewicz Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/cute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include "cute_guid.h"
#include "cute_graphics.h"
#include "cute_map.h"
#include "cute_haptics.h"
#include "cute_https.h"
#include "cute_image.h"
#include "cute_input.h"
Expand Down
5 changes: 5 additions & 0 deletions include/cute_defer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
*/

#ifndef CF_DEFER_H
#define CF_DEFER_H

#include "cute_defines.h"

#ifdef CF_CPP
Expand Down Expand Up @@ -61,3 +64,5 @@ static CF_ScopeExit<T> s_create_scope_helper(T func)
#define CF_DEFER(L) const auto& CF_TOKEN_PASTE(CF_ScopeExit, __LINE__) = s_create_scope_helper([&]() { L; })

#endif // CF_CPP

#endif // CF_DEFER_H
2 changes: 1 addition & 1 deletion include/cute_haptics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ CF_INLINE const char* to_string(HapticWaveType type)
}
}

CF_INLINE Haptic haptic_open(Joypad joypad) { return cf_haptic_open(joypad); }
CF_INLINE Haptic haptic_open(int player_index) { return cf_haptic_open(player_index); }
CF_INLINE void haptic_close(Haptic haptic) { cf_haptic_close(haptic); }
CF_INLINE bool haptic_supports(Haptic haptic, HapticType type) { return cf_haptic_supports(haptic,type); }
CF_INLINE void haptic_set_gain(Haptic haptic, float gain) { cf_haptic_set_gain(haptic,gain); }
Expand Down
4 changes: 2 additions & 2 deletions include/cute_networking.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
#ifndef CF_NETWORKING_H
#define CF_NETWORKING_H

#include <cute_defines.h>
#include "cute_defines.h"

// This entire file makes no sense for web builds, since web doesn't allow UDP.
#ifndef CF_EMSCRIPTEN

#include <cute_result.h>
#include "cute_result.h"
#include <cute/cute_net.h>

//--------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions include/cute_noise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
*/

#ifndef CUTE_PERLIN_H
#define CUTE_PERLIN_H
#ifndef CF_NOISE_H
#define CF_NOISE_H

#include "cute_defines.h"
#include "cute_graphics.h"
Expand Down Expand Up @@ -211,4 +211,4 @@ CF_INLINE CF_Pixel* noise_fbm_pixels_wrapped(int w, int h, uint64_t seed, float

#endif // CF_CPP

#endif // CUTE_PERLIN_H
#endif // CF_NOISE_H
2 changes: 1 addition & 1 deletion include/cute_shader_bytecode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef CF_SHADER_BYTECODE_H
#define CF_SHADER_BYTECODE_H

#include <cute_defines.h>
#include "cute_defines.h"

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions include/cute_user_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
This software is dual-licensed with zlib or Unlicense, check LICENSE.txt for more info
*/

#ifndef CUTE_USER_CONFIG_H
#define CUTE_USER_CONFIG_H
#ifndef CF_USER_CONFIG_H
#define CF_USER_CONFIG_H

/**
* Feel free to override any macros in Cute Framework with your own. These are mainly to change the default
Expand Down Expand Up @@ -50,4 +50,4 @@
* CF_FMODF
*/

#endif // CUTE_USER_CONFIG_H
#endif // CF_USER_CONFIG_H
Loading