Had to rename sfml to sfmlbackend because on Windows the filesystem is case insensitive so include <SFML/*> was accidentally including _my_ <sfml/config.hpp> file.

main
Zed A. Shaw 3 weeks ago
parent f3f2e90cd2
commit 06ca57e5da
  1. 4
      demos/calc.cpp
  2. 2
      include/guecs.hpp
  3. 0
      include/sfmlbackend/backend.hpp
  4. 0
      include/sfmlbackend/color.hpp
  5. 2
      include/sfmlbackend/components.hpp
  6. 0
      include/sfmlbackend/config.hpp
  7. 0
      include/sfmlbackend/shaders.hpp
  8. 0
      include/sfmlbackend/sound.hpp
  9. 0
      include/sfmlbackend/textures.hpp
  10. 36
      meson.build
  11. 8
      src/sfmlbackend/backend.cpp
  12. 2
      src/sfmlbackend/components.cpp
  13. 2
      src/sfmlbackend/config.cpp
  14. 4
      src/sfmlbackend/shaders.cpp
  15. 4
      src/sfmlbackend/sound.cpp
  16. 4
      src/sfmlbackend/textures.cpp
  17. 2
      tests/shaders.cpp
  18. 2
      tests/sound.cpp
  19. 2
      tests/textures.cpp

@ -1,5 +1,5 @@
#include "sfml/backend.hpp" #include "sfmlbackend/backend.hpp"
#include "sfml/components.hpp" #include "sfmlbackend/components.hpp"
#include "guecs.hpp" #include "guecs.hpp"
#include <fmt/xchar.h> #include <fmt/xchar.h>
#include <deque> #include <deque>

@ -8,7 +8,7 @@
#include <queue> #include <queue>
#include <typeindex> #include <typeindex>
#include <unordered_map> #include <unordered_map>
#include "sfml/components.hpp" #include "sfmlbackend/components.hpp"
namespace guecs { namespace guecs {
using std::shared_ptr, std::wstring, std::string; using std::shared_ptr, std::wstring, std::string;

@ -2,7 +2,7 @@
#include <SFML/Graphics.hpp> #include <SFML/Graphics.hpp>
#include "dbc.hpp" #include "dbc.hpp"
#include "sfml/color.hpp" #include "sfmlbackend/color.hpp"
#include "lel.hpp" #include "lel.hpp"
#include <string> #include <string>
#include <memory> #include <memory>

@ -72,15 +72,15 @@ sources = [
'src/dbc.cpp', 'src/dbc.cpp',
'src/guecs.cpp', 'src/guecs.cpp',
'src/lel.cpp', 'src/lel.cpp',
'src/sfml/components.cpp', 'src/sfmlbackend/components.cpp',
] ]
sfml_impl = [ sfml_impl = [
'src/sfml/config.cpp', 'src/sfmlbackend/config.cpp',
'src/sfml/backend.cpp', 'src/sfmlbackend/backend.cpp',
'src/sfml/shaders.cpp', 'src/sfmlbackend/shaders.cpp',
'src/sfml/sound.cpp', 'src/sfmlbackend/sound.cpp',
'src/sfml/textures.cpp', 'src/sfmlbackend/textures.cpp',
] ]
lel_guecs_inc = include_directories('include') lel_guecs_inc = include_directories('include')
@ -97,9 +97,11 @@ lel_guecs_dep = declare_dependency(
link_with: lel_guecs_lib, link_with: lel_guecs_lib,
include_directories: lel_guecs_inc) include_directories: lel_guecs_inc)
executable('runtests', [ executable('runtests', sfml_impl + [
'src/sfml/config.cpp',
'tests/lel.cpp', 'tests/lel.cpp',
'tests/shaders.cpp',
'tests/sound.cpp',
'tests/textures.cpp',
'tests/guecs.cpp', 'tests/guecs.cpp',
], ],
cpp_args: cpp_args, cpp_args: cpp_args,
@ -109,12 +111,12 @@ executable('runtests', [
link_with: [lel_guecs_lib], link_with: [lel_guecs_lib],
dependencies: dependencies + [catch2]) dependencies: dependencies + [catch2])
#executable('calc', sfml_impl + [ executable('calc', sfml_impl + [
# 'demos/calc.cpp', 'demos/calc.cpp',
# ], ],
# cpp_args: cpp_args, cpp_args: cpp_args,
# link_args: link_args, link_args: link_args,
# override_options: exe_defaults, override_options: exe_defaults,
# include_directories: lel_guecs_inc, include_directories: lel_guecs_inc,
# link_with: [lel_guecs_lib], link_with: [lel_guecs_lib],
# dependencies: dependencies) dependencies: dependencies)

@ -1,7 +1,7 @@
#include "sfml/backend.hpp" #include "sfmlbackend/backend.hpp"
#include "sfml/shaders.hpp" #include "sfmlbackend/shaders.hpp"
#include "sfml/sound.hpp" #include "sfmlbackend/sound.hpp"
#include "sfml/textures.hpp" #include "sfmlbackend/textures.hpp"
namespace sfml { namespace sfml {
guecs::SpriteTexture Backend::texture_get(const string& name) { guecs::SpriteTexture Backend::texture_get(const string& name) {

@ -1,5 +1,5 @@
#include "guecs.hpp" #include "guecs.hpp"
#include "sfml/backend.hpp" #include "sfmlbackend/backend.hpp"
namespace guecs { namespace guecs {
static Backend* BACKEND = nullptr; static Backend* BACKEND = nullptr;

@ -1,4 +1,4 @@
#include "sfml/config.hpp" #include "sfmlbackend/config.hpp"
#include "dbc.hpp" #include "dbc.hpp"
#include <fmt/core.h> #include <fmt/core.h>

@ -1,8 +1,8 @@
#include "sfml/shaders.hpp" #include "sfmlbackend/shaders.hpp"
#include <SFML/Graphics/Image.hpp> #include <SFML/Graphics/Image.hpp>
#include "dbc.hpp" #include "dbc.hpp"
#include <fmt/core.h> #include <fmt/core.h>
#include "sfml/config.hpp" #include "sfmlbackend/config.hpp"
#include <memory> #include <memory>
namespace shaders { namespace shaders {

@ -1,7 +1,7 @@
#include "sfml/sound.hpp" #include "sfmlbackend/sound.hpp"
#include "dbc.hpp" #include "dbc.hpp"
#include <fmt/core.h> #include <fmt/core.h>
#include "sfml/config.hpp" #include "sfmlbackend/config.hpp"
namespace sound { namespace sound {
static SoundManager SMGR; static SoundManager SMGR;

@ -1,8 +1,8 @@
#include "sfml/textures.hpp" #include "sfmlbackend/textures.hpp"
#include <SFML/Graphics/Image.hpp> #include <SFML/Graphics/Image.hpp>
#include "dbc.hpp" #include "dbc.hpp"
#include <fmt/core.h> #include <fmt/core.h>
#include "sfml/config.hpp" #include "sfmlbackend/config.hpp"
#include <memory> #include <memory>
namespace textures { namespace textures {

@ -1,7 +1,7 @@
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <string> #include <string>
#include "sfml/shaders.hpp" #include "sfmlbackend/shaders.hpp"
using namespace fmt; using namespace fmt;

@ -1,7 +1,7 @@
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <string> #include <string>
#include "sfml/sound.hpp" #include "sfmlbackend/sound.hpp"
using namespace fmt; using namespace fmt;

@ -1,7 +1,7 @@
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/core.h> #include <fmt/core.h>
#include <string> #include <string>
#include "sfml/textures.hpp" #include "sfmlbackend/textures.hpp"
using namespace fmt; using namespace fmt;

Loading…
Cancel
Save