From 36e635e9b5d807d09823c8fd2e038b56134dfba0 Mon Sep 17 00:00:00 2001 From: "Eduardo P. Gomez" Date: Tue, 19 Sep 2023 22:13:36 -0300 Subject: [PATCH] Easy pack/installer --- .gitignore | 3 +++ CMakeLists.txt | 14 ++++++++++++++ pack.sh | 5 +++++ prod_include/windows.h | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 pack.sh diff --git a/.gitignore b/.gitignore index 0fa414ef..f814cf71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +include/config.hpp CMakeLists.txt.user CMakeCache.txt CMakeFiles @@ -12,4 +13,6 @@ _deps build .kdev4 OpenDX.kdev4 +opendx.tar +opendx.deb !build/.no-delete diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b0c5fc9..af68e9f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,17 @@ cmake_minimum_required(VERSION 3.22) project(OpenDX) set(PROJECT_SOURCE_DIR "${CMAKE_SOURCE_DIR}") +#Package +set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/root) +set(CPACK_GENERATOR "DEB") +set(CPACK_PACKAGE_NAME "opendx") +set(CPACK_PACKAGE_VERSION "1.0.0") +set(CPACK_PACKAGE_DESCRIPTION "Open Source reimplementation of DirectX for Linux") +set(CPACK_PACKAGE_CONTACT "Eduardo P. Gomez ") + +include(CPack) +install(DIRECTORY ${CMAKE_BINARY_DIR}/root/ DESTINATION /) + find_package(PkgConfig) pkg_check_modules(PC_ QUIET ) set(_DEFINITIONS ${PC__CFLAGS_OTHER}) @@ -34,6 +45,9 @@ find_package_handle_standard_args( DEFAULT_MSG _LIBRARY _INCLUDE_DIR) mark_as_advanced(_INCLUDE_DIR _LIBRARY ) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/root/usr/bin") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/root/usr/lib") + #base include include_directories(./include) configure_file(include/config.hpp.in ../include/config.hpp) diff --git a/pack.sh b/pack.sh new file mode 100755 index 00000000..294da71e --- /dev/null +++ b/pack.sh @@ -0,0 +1,5 @@ +tar -cvf opendx.tar -C build/root . +cd build +cpack +cd .. +mv build/opendx*.deb ./opendx.deb diff --git a/prod_include/windows.h b/prod_include/windows.h index 0f06a542..4c697ba9 100644 --- a/prod_include/windows.h +++ b/prod_include/windows.h @@ -32,7 +32,7 @@ #include #include #include -#include +//#include #define LPCTSTR const char* #define DWORD unsigned long