From 3868e2a64ebc7e8c999a100c05c62d8ec9f485c9 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Mon, 17 Jul 2023 15:30:24 +0200
Subject: [PATCH] Move sources in src subfolder, samples in samples
---
.wikiheaders-options | 4 ++--
CMakeLists.txt | 25 ++++++++++++-------------
showrtf.c => examples/showrtf.c | 0
SDL_rtf.h => include/SDL2/SDL_rtf.h | 0
SDL_rtf.c => src/SDL_rtf.c | 0
SDL_rtfreadr.c => src/SDL_rtfreadr.c | 0
SDL_rtfreadr.h => src/SDL_rtfreadr.h | 0
rtfactn.c => src/rtfactn.c | 0
rtfdecl.h => src/rtfdecl.h | 0
rtfreadr.c => src/rtfreadr.c | 0
rtftype.h => src/rtftype.h | 0
version.rc => src/version.rc | 0
12 files changed, 14 insertions(+), 15 deletions(-)
rename showrtf.c => examples/showrtf.c (100%)
rename SDL_rtf.h => include/SDL2/SDL_rtf.h (100%)
rename SDL_rtf.c => src/SDL_rtf.c (100%)
rename SDL_rtfreadr.c => src/SDL_rtfreadr.c (100%)
rename SDL_rtfreadr.h => src/SDL_rtfreadr.h (100%)
rename rtfactn.c => src/rtfactn.c (100%)
rename rtfdecl.h => src/rtfdecl.h (100%)
rename rtfreadr.c => src/rtfreadr.c (100%)
rename rtftype.h => src/rtftype.h (100%)
rename version.rc => src/version.rc (100%)
diff --git a/.wikiheaders-options b/.wikiheaders-options
index 50109a5..fdb6c51 100644
--- a/.wikiheaders-options
+++ b/.wikiheaders-options
@@ -3,8 +3,8 @@ projectshortname = SDL_rtf
incsubdir =
wikisubdir = SDL_rtf
apiprefixregex = RTF_
-mainincludefname = SDL_rtf.h
-versionfname = SDL_rtf.h
+mainincludefname = SDL2/SDL_rtf.h
+versionfname = include/SDL2/SDL_rtf.h
versionmajorregex = \A\#define\s+SDL_RTF_MAJOR_VERSION\s+(\d+)\Z
versionminorregex = \A\#define\s+SDL_RTF_MINOR_VERSION\s+(\d+)\Z
versionpatchregex = \A\#define\s+SDL_RTF_PATCHLEVEL\s+(\d+)\Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025eb50..722f977 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,19 +72,18 @@ if(NOT TARGET ${sdl2ttf_target_name})
endif()
add_library(SDL2_rtf
- rtfactn.c
- rtfdecl.h
- rtfreadr.c
- rtftype.h
- SDL_rtf.c
- SDL_rtf.h
- SDL_rtfreadr.c
- SDL_rtfreadr.h
+ src/rtfactn.c
+ src/rtfreadr.c
+ src/SDL_rtf.c
+ src/SDL_rtfreadr.c
)
add_library(SDL2_rtf::${sdl2_rtf_export_name} ALIAS SDL2_rtf)
target_include_directories(SDL2_rtf PUBLIC
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SDL2>"
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/SDL2>"
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>"
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include/SDL2>"
)
target_compile_definitions(SDL2_rtf PRIVATE
BUILD_SDL
@@ -95,7 +94,7 @@ target_compile_definitions(SDL2_rtf PRIVATE
target_link_libraries(SDL2_rtf PRIVATE $<BUILD_INTERFACE:${sdl2_target_name}> $<BUILD_INTERFACE:${sdl2ttf_target_name}>)
if(WIN32 AND SDL2RTF_BUILD_SHARED_LIBS)
target_sources(SDL2_rtf PRIVATE
- version.rc
+ src/version.rc
)
endif()
set_target_properties(SDL2_rtf PROPERTIES
@@ -165,7 +164,7 @@ if(SDL2RTF_INSTALL)
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT library
)
install(
- FILES "${CMAKE_CURRENT_SOURCE_DIR}/SDL_rtf.h"
+ FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/SDL2/SDL_rtf.h"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/SDL2" COMPONENT DEVEL
)
@@ -241,7 +240,7 @@ if(SDL2RTF_INSTALL)
endif()
if(SDL2RTF_SAMPLES)
- add_executable(showrtf showrtf.c)
+ add_executable(showrtf examples/showrtf.c)
find_package(SDL2main QUIET)
diff --git a/showrtf.c b/examples/showrtf.c
similarity index 100%
rename from showrtf.c
rename to examples/showrtf.c
diff --git a/SDL_rtf.h b/include/SDL2/SDL_rtf.h
similarity index 100%
rename from SDL_rtf.h
rename to include/SDL2/SDL_rtf.h
diff --git a/SDL_rtf.c b/src/SDL_rtf.c
similarity index 100%
rename from SDL_rtf.c
rename to src/SDL_rtf.c
diff --git a/SDL_rtfreadr.c b/src/SDL_rtfreadr.c
similarity index 100%
rename from SDL_rtfreadr.c
rename to src/SDL_rtfreadr.c
diff --git a/SDL_rtfreadr.h b/src/SDL_rtfreadr.h
similarity index 100%
rename from SDL_rtfreadr.h
rename to src/SDL_rtfreadr.h
diff --git a/rtfactn.c b/src/rtfactn.c
similarity index 100%
rename from rtfactn.c
rename to src/rtfactn.c
diff --git a/rtfdecl.h b/src/rtfdecl.h
similarity index 100%
rename from rtfdecl.h
rename to src/rtfdecl.h
diff --git a/rtfreadr.c b/src/rtfreadr.c
similarity index 100%
rename from rtfreadr.c
rename to src/rtfreadr.c
diff --git a/rtftype.h b/src/rtftype.h
similarity index 100%
rename from rtftype.h
rename to src/rtftype.h
diff --git a/version.rc b/src/version.rc
similarity index 100%
rename from version.rc
rename to src/version.rc