Skip to content

Commit 68d088e

Browse files
Merge pull request #3 from elgatosf/demo/export-demo
Merges all pre-release changes into main.
2 parents ee73b43 + 85913d5 commit 68d088e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3774
-1013
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function(setup_obs_lib_dependency target)
3434
endif()
3535
endfunction()
3636

37-
project(elgato-deeplinking VERSION 0.0.1)
37+
project(elgato-marketplace VERSION 0.0.8)
3838

3939
if(${CMAKE_PROJECT_NAME} STREQUAL "obs-studio")
4040
set(OBS_FRONTEND_API_NAME "frontend-api")
@@ -85,6 +85,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl nlohmann_json::nlohm
8585
target_sources(
8686
${PROJECT_NAME}
8787
PRIVATE src/plugin-module.cpp
88+
src/elgato-styles.hpp
8889
src/zip_file.hpp
8990
src/api.cpp
9091
src/api.hpp
@@ -94,6 +95,8 @@ target_sources(
9495
src/platform.h
9596
src/util.cpp
9697
src/util.h
98+
src/plugins.cpp
99+
src/plugins.hpp
97100
src/obs-utils.cpp
98101
src/obs-utils.hpp
99102
src/display-helpers.hpp
@@ -116,7 +119,9 @@ target_sources(
116119
src/elgato-cloud-config.cpp
117120
src/elgato-cloud-config.hpp
118121
src/elgato-cloud-window.cpp
119-
src/elgato-cloud-window.hpp)
122+
src/elgato-cloud-window.hpp
123+
src/elgato-widgets.cpp
124+
src/elgato-widgets.hpp)
120125

121126
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
122127

buildspec.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
},
3636
"platformConfig": {
3737
"macos": {
38-
"bundleId": "com.elgato.deeplinking"
38+
"bundleId": "com.elgato.marketplace-plugin"
3939
}
4040
},
41-
"name": "elgato-deeplinking",
42-
"displayName": "Elgato Deep Linking",
43-
"version": "0.0.1",
41+
"name": "elgato-marketplace",
42+
"displayName": "Elgato Marketplace Plugin",
43+
"version": "0.0.8",
4444
"author": "Elgato",
4545
"website": "https://elgato.com",
4646
"email": "support@elgato.com",

data/images/Store.svg

Lines changed: 3 additions & 0 deletions
Loading

data/images/checkbox_checked.png

343 Bytes
Loading

data/images/checkbox_unchecked.png

306 Bytes
Loading

data/images/download.svg

Lines changed: 4 additions & 0 deletions
Loading

data/images/download_disabled.svg

Lines changed: 4 additions & 0 deletions
Loading

data/images/download_hover.svg

Lines changed: 4 additions & 0 deletions
Loading

data/images/image-loading.svg

Lines changed: 4 additions & 0 deletions
Loading

data/images/marketplace-logo.svg

Lines changed: 22 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)