diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2021-10-26 11:45:04 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2021-10-26 11:45:04 +0200 |
commit | 8aa5c5a29c5af282c8c89a489f91617f59a97706 (patch) | |
tree | ffc0989f406f5aa7083c74d3938c81a060ace12a /src/osd/modules/lib | |
parent | 67389f4cbdd00e1b139590325d5fbae47d0e62d0 (diff) |
Remove OSD_UWP from rest of code
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r-- | src/osd/modules/lib/osdlib.h | 11 | ||||
-rw-r--r-- | src/osd/modules/lib/osdlib_win32.cpp | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h index cb3c2dcdce8..4a06b7052f5 100644 --- a/src/osd/modules/lib/osdlib.h +++ b/src/osd/modules/lib/osdlib.h @@ -188,20 +188,9 @@ protected: // Calling then looks like: DYNAMIC_CALL(CreateDXGIFactory1, p1, p2, etc) //========================================================================================================= -#if !defined(OSD_UWP) - #define OSD_DYNAMIC_API(apiname, ...) osd::dynamic_module::ptr m_##apiname##module = osd::dynamic_module::open( { __VA_ARGS__ } ) #define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...) ret(conv *m_##fname##_pfn)( __VA_ARGS__ ) = m_##apiname##module->bind<ret(conv *)( __VA_ARGS__ )>(#fname) #define OSD_DYNAMIC_CALL(fname, ...) (*m_##fname##_pfn) ( __VA_ARGS__ ) #define OSD_DYNAMIC_API_TEST(fname) (m_##fname##_pfn != nullptr) -#else - -#define OSD_DYNAMIC_API(apiname, ...) -#define OSD_DYNAMIC_API_FN(apiname, ret, conv, fname, ...) -#define OSD_DYNAMIC_CALL(fname, ...) fname( __VA_ARGS__ ) -#define OSD_DYNAMIC_API_TEST(fname) (true) - -#endif - #endif /* __OSDLIB__ */ diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp index b75500deee9..174dc769760 100644 --- a/src/osd/modules/lib/osdlib_win32.cpp +++ b/src/osd/modules/lib/osdlib_win32.cpp @@ -195,13 +195,8 @@ int osd_getpid() // osd_dynamic_bind //============================================================ -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) // for classic desktop applications #define load_library(filename) LoadLibrary(filename) -#else -// for Windows Store universal applications -#define load_library(filename) LoadPackagedLibrary(filename, 0) -#endif namespace osd { |