Skip to content

Commit f745141

Browse files
committed
build: Add pkgconf definitions for optional nxdk components
1 parent 60d741c commit f745141

File tree

6 files changed

+33
-129
lines changed

6 files changed

+33
-129
lines changed

lib/pkgconfig/nxdk_automount_d.pc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Name: nxdk_automount_d
2+
Description: Automatic mounting of the "D:" for nxdk XBEs.
3+
Version: 1.0.0
4+
Requires:
5+
Conflicts:
6+
Libs: -l${NXDK_DIR}/lib/libnxdk_automount_d.lib
7+
Cflags:

lib/pkgconfig/nxdk_net.pc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Name: nxdk_net
2+
Description: Network functionality for the NXDK
3+
Version: 1.0.0
4+
Requires:
5+
Conflicts:
6+
Libs: -l${NXDK_DIR}/lib/libnxdk_net.lib
7+
Cflags: -I${NXDK_DIR}/lib/net/lwip/src/include -I${NXDK_DIR}/lib/net/nforceif/include -I${NXDK_DIR}//lib/net/nvnetdrv

lib/pkgconfig/pbkit.pc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Name: pbkit
2+
Description: Pushbuffer management
3+
Version: 1.0.0
4+
Requires:
5+
Conflicts:
6+
Libs: -l${NXDK_DIR}/lib/libpbkit.lib
7+
Cflags:

lib/pkgconfig/winmm.pc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Name: winmm
2+
Description: WinAPI multimedia extensions
3+
Version: 1.0.0
4+
Requires:
5+
Conflicts:
6+
Libs: -l${NXDK_DIR}/lib/winmm.lib
7+
Cflags:

tests/cmake/test_project/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ include(FindPkgConfig)
1515

1616
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
1717
include(XBEUtils REQUIRED)
18-
find_package(NXDK REQUIRED)
1918

2019
pkg_check_modules(
2120
nxdk_packages
2221
REQUIRED
23-
sdl2
2422
SDL2_image
2523
SDL2_ttf
2624
libjpeg
2725
libpng
26+
nxdk_automount_d
27+
nxdk_net
28+
pbkit
29+
sdl2
30+
winmm
2831
zlib
2932
)
3033

@@ -45,8 +48,6 @@ target_link_libraries(
4548
${PROJECT_NAME}
4649
PRIVATE
4750
${nxdk_packages_LIBRARIES}
48-
NXDK::NXDK
49-
NXDK::NXDK_CXX
5051
)
5152

5253
target_compile_options(

tests/cmake/test_project/cmake/modules/FindNXDK.cmake

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)