Skip to content

Commit 68af8e8

Browse files
WizardCMRytoEX
authored andcommitted
Build with Windows file descriptors
See obsproject/obs-studio#1944
1 parent f76de5f commit 68af8e8

3 files changed

Lines changed: 54 additions & 0 deletions

File tree

cmake/os-windows.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_SHARED_TEXTURE)
44
target_link_libraries(obs-browser PRIVATE CEF::Wrapper CEF::Library d3d11 dxgi)
55
target_link_options(obs-browser PRIVATE /IGNORE:4099)
66

7+
configure_file(cmake/windows/obs-module.rc.in obs-browser.rc)
8+
target_sources(obs-browser PRIVATE obs-browser.rc)
9+
710
add_executable(obs-browser-helper WIN32 EXCLUDE_FROM_ALL)
811
add_executable(OBS::browser-helper ALIAS obs-browser-helper)
912

@@ -13,6 +16,9 @@ target_sources(
1316
browser-app.cpp browser-app.hpp cef-headers.hpp obs-browser-page.manifest
1417
obs-browser-page/obs-browser-page-main.cpp)
1518

19+
configure_file(cmake/windows/obs-module-helper.rc.in obs-browser-page.rc)
20+
target_sources(obs-browser-helper PRIVATE obs-browser-page.rc)
21+
1622
target_include_directories(obs-browser-helper PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps"
1723
"${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page")
1824

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
1 VERSIONINFO
2+
FILEVERSION ${OBS_VERSION_MAJOR},${OBS_VERSION_MINOR},${OBS_VERSION_PATCH},0
3+
BEGIN
4+
BLOCK "StringFileInfo"
5+
BEGIN
6+
BLOCK "040904B0"
7+
BEGIN
8+
VALUE "CompanyName", "${OBS_COMPANY_NAME}"
9+
VALUE "FileDescription", "OBS Browser Page"
10+
VALUE "FileVersion", "${OBS_VERSION_CANONICAL}"
11+
VALUE "ProductName", "${OBS_PRODUCT_NAME}"
12+
VALUE "ProductVersion", "${OBS_VERSION_CANONICAL}"
13+
VALUE "Comments", "${OBS_COMMENTS}"
14+
VALUE "LegalCopyright", "${OBS_LEGAL_COPYRIGHT}"
15+
VALUE "InternalName", "obs-browser-page"
16+
VALUE "OriginalFilename", "obs-browser-page"
17+
END
18+
END
19+
20+
BLOCK "VarFileInfo"
21+
BEGIN
22+
VALUE "Translation", 0x0409, 0x04B0
23+
END
24+
END

cmake/windows/obs-module.rc.in

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
1 VERSIONINFO
2+
FILEVERSION ${OBS_VERSION_MAJOR},${OBS_VERSION_MINOR},${OBS_VERSION_PATCH},0
3+
BEGIN
4+
BLOCK "StringFileInfo"
5+
BEGIN
6+
BLOCK "040904B0"
7+
BEGIN
8+
VALUE "CompanyName", "${OBS_COMPANY_NAME}"
9+
VALUE "FileDescription", "OBS Browser module"
10+
VALUE "FileVersion", "${OBS_VERSION_CANONICAL}"
11+
VALUE "ProductName", "${OBS_PRODUCT_NAME}"
12+
VALUE "ProductVersion", "${OBS_VERSION_CANONICAL}"
13+
VALUE "Comments", "${OBS_COMMENTS}"
14+
VALUE "LegalCopyright", "${OBS_LEGAL_COPYRIGHT}"
15+
VALUE "InternalName", "obs-browser"
16+
VALUE "OriginalFilename", "obs-browser"
17+
END
18+
END
19+
20+
BLOCK "VarFileInfo"
21+
BEGIN
22+
VALUE "Translation", 0x0409, 0x04B0
23+
END
24+
END

0 commit comments

Comments
 (0)