Skip to content

Commit

Permalink
v1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
inanevin committed Aug 9, 2023
1 parent a418aa1 commit a15e92f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ add_library(Lina::VG ALIAS ${PROJECT_NAME})
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MAJOR=1)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MINOR=6)
target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=0)

target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=1)
1
#--------------------------------------------------------------------
# Subdirectories & linking
#--------------------------------------------------------------------
Expand Down
7 changes: 4 additions & 3 deletions Example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,17 @@ PUBLIC Lina::VG

include(Dependencies/Dependencies.cmake)

set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}/$<CONFIGURATION>/")

add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/_Resources" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
message(${CMAKE_BINARY_DIR}/${PROJECT_NAME}/)
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../_Resources/" "${CMAKE_BINARY_DIR}/bin/${PROJECT_NAME}/$<CONFIGURATION>/")

add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/_Resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>/")
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/../_Resources" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>/")

#--------------------------------------------------------------------
# Folder structuring in visual studio
Expand Down
2 changes: 1 addition & 1 deletion Example/include/Backends/GL/GLBackend.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Timestamp: 3/24/2022 11:33:52 PM
#define LinaVGGLBackend_HPP

// Headers here.
#include <LinaVG.hpp>
#include "LinaVG/LinaVG.hpp"

namespace LinaVG::Backend
{
Expand Down
2 changes: 1 addition & 1 deletion Example/include/DemoScreens.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SOFTWARE.
#ifndef DEMOS_HPP
#define DEMOS_HPP

#include "Core/Common.hpp"
#include "LinaVG/Core/Common.hpp"
#include <vector>

namespace LinaVG
Expand Down
6 changes: 3 additions & 3 deletions Example/src/Backends/GL/GLBackend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ SOFTWARE.

#include "glad/glad.h"
#include "Backends/GL/GLBackend.hpp"
#include "Core/Renderer.hpp"
#include "Core/Drawer.hpp"
#include "Core/Math.hpp"
#include "LinaVG/Core/Renderer.hpp"
#include "LinaVG/Core/Drawer.hpp"
#include "LinaVG/Core/Math.hpp"
#include <iostream>
#include <stdio.h>

Expand Down
6 changes: 3 additions & 3 deletions Example/src/DemoScreens.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ SOFTWARE.

#include "DemoScreens.hpp"
#include "Main.hpp"
#include "LinaVG.hpp"
#include "Core/Math.hpp"
#include "Utility/Utility.hpp"
#include "LinaVG/LinaVG.hpp"
#include "LinaVG/Core/Math.hpp"
#include "LinaVG/Utility/Utility.hpp"
#include "Backends/GL/GLBackend.hpp"
#include <string>
#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion Example/src/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SOFTWARE.
*/

#include "Main.hpp"
#include "LinaVG.hpp"
#include "LinaVG/LinaVG.hpp"
#include <iostream>
#include <chrono>
#include "Backends/GLFWWindow.hpp"
Expand Down
5 changes: 2 additions & 3 deletions include/LinaVG/Core/Common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/


#pragma once

#ifndef LinaVGCommon_HPP
Expand All @@ -51,8 +50,8 @@ namespace LinaVG
#define LVG_DEG2RAD 0.0174533f
#define LINAVG_API // TODO

typedef unsigned int Index;
typedef unsigned int BackendHandle;
typedef unsigned short Index;
typedef unsigned int BackendHandle;
class LinaVGFont;

/// <summary>
Expand Down

0 comments on commit a15e92f

Please sign in to comment.