diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2018-03-19 07:39:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 07:39:08 +0000 |
| commit | 6f76041029393c6823973a29426b28c8c2d0b064 (patch) | |
| tree | 13c1bb5215c2510a7c430b59bc22df666cd2fbf3 /plugins/nullsio1 | |
| parent | 768332417644451d38ce1a737465656c7cc75de3 (diff) | |
| parent | 128d6afb179756513860187cf5e31d84d6d8cac4 (diff) | |
| download | pcsxr-6f76041029393c6823973a29426b28c8c2d0b064.tar.gz | |
Merge pull request #7 from loathingKernel/sync-with-codeplex
Sync with codeplex
Diffstat (limited to 'plugins/nullsio1')
| -rw-r--r-- | plugins/nullsio1/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | plugins/nullsio1/Makefile.am | 10 |
2 files changed, 21 insertions, 10 deletions
diff --git a/plugins/nullsio1/CMakeLists.txt b/plugins/nullsio1/CMakeLists.txt new file mode 100644 index 00000000..b7eaf48a --- /dev/null +++ b/plugins/nullsio1/CMakeLists.txt @@ -0,0 +1,21 @@ +message(STATUS "* Configuring nullsio1") + + +#deps + + +#defs +add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu") + +#sources +set(PLUGIN_SRCS + sio1.c +) + + +include_directories(${CMAKE_SOURCE_DIR}/libpcsxcore) +add_library(NullSio1 MODULE ${PLUGIN_SRCS}) + + + +install(TARGETS NullSio1 LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu) diff --git a/plugins/nullsio1/Makefile.am b/plugins/nullsio1/Makefile.am deleted file mode 100644 index 9d78b632..00000000 --- a/plugins/nullsio1/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bindir = @libdir@/games/psemu/ -libdir = @libdir@/games/psemu/ - -lib_LTLIBRARIES = libNullSio1.la - -libNullSio1_la_SOURCES = sio1.c typedefs.h -libNullSio1_la_LDFLAGS = -module -avoid-version - -AM_CPPFLAGS = -DDATADIR=\"${datadir}/psemu/\" \ - -I$(top_srcdir)/libpcsxcore -I../../include |