Changeset 27e580e in opengl-game


Ignore:
Timestamp:
Jun 1, 2022, 7:50:43 PM (2 years ago)
Author:
Dmitry Portnoy <dportnoy@…>
Branches:
feature/imgui-sdl
Children:
6d698e5
Parents:
67527a5
Message:

Stop using SDL_ttf

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • VulkanGame.vcxproj

    r67527a5 r27e580e  
    7171  <PropertyGroup Label="UserMacros" />
    7272  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    73     <IncludePath>include;$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
    74     <LibraryPath>lib;$(VULKAN_SDK)/Lib;$(LibraryPath)</LibraryPath>
     73    <IncludePath>$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
     74    <LibraryPath>$(VULKAN_SDK)/Lib;$(VULKAN_SDK)/Third-Party/Bin;$(LibraryPath)</LibraryPath>
    7575  </PropertyGroup>
    7676  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    77     <IncludePath>include;$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
    78     <LibraryPath>lib;$(VULKAN_SDK)/Lib;$(LibraryPath)</LibraryPath>
     77    <IncludePath>$(VULKAN_SDK)/Include;$(VULKAN_SDK)/Third-Party/Include;$(IncludePath)</IncludePath>
     78    <LibraryPath>$(VULKAN_SDK)/Lib;$(VULKAN_SDK)/Third-Party/Bin;$(LibraryPath)</LibraryPath>
    7979  </PropertyGroup>
    8080  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    … …  
    9191    <Link>
    9292      <SubSystem>Console</SubSystem>
    93       <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_ttf.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     93      <AdditionalDependencies>SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
    9494    </Link>
    9595  </ItemDefinitionGroup>
    … …  
    135135      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    136136      <OptimizeReferences>true</OptimizeReferences>
    137       <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_ttf.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     137      <AdditionalDependencies>SDL2.lib;SDL2main.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
    138138    </Link>
    139139  </ItemDefinitionGroup>

  • game-gui-sdl.cpp

    r67527a5 r27e580e  
    33#include <map>
    44#include <queue>
    5 
    6 #include <SDL2/SDL_ttf.h>
    75
    86#include "compiler.hpp"
    … …  
    2826
    2927   if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
    30       return RTWO_ERROR;
    31    }
    32 
    33    if (TTF_Init() == -1) {
    3428      return RTWO_ERROR;
    3529   }

  • vulkan-game.hpp

    r67527a5 r27e580e  
    1010
    1111#include <SDL2/SDL.h>
    12 #include <SDL2/SDL_ttf.h>
    1312
    1413#define GLM_FORCE_RADIANS
Note: See TracChangeset for help on using the changeset viewer.