3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity
23,573 Commits 2 Branches 60 Tags 758 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
Frank
9419283e45
[mygui] Fix LNK2005 duplicate function definition (#38386) 
Fix
https://github.com/microsoft/vcpkg/issues/34416#issuecomment-2068572360
Error:
```
LINK Pass 1: command "C:\PROGRA~1\MICROS~3\2022\COMMUN~1\VC\Tools\MSVC\1439~1.335\bin\Hostx64\x64\link.exe Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\cmake_pch.cxx.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\__\__\Common\Precompiled.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\Application.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\ApplicationState.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\AreaSelectorControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\BackgroundControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\BackwardCompatibilityManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\CodeGenerator.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\EditorState.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\EditorToolTip.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\EditorWidgets.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\GroupMessage.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\LayoutEditor.rc.res Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\MainMenuControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\MainPaneControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\MainWorkspaceControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\MyGUI_RTTLayer.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelControllers.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelExtensionProperties.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelItems.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelMainProperties.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelProperties.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelTemplateProperties.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PanelUserData.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\Parse.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PositionSelectorControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\ProjectControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertiesPanelView.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldAlpha.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldColour.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldComboBox.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldEditBox.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldFileName.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldFont.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldNumeric.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldPosition.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldSkin.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\PropertyFieldType.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\RecentFilesManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SelectorControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SeparatorPartControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SettingsGeneralControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SettingsResourcePathsControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SettingsResourcesControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SettingsUpdateResourcesControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\SettingsWidgetsControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\StatisticInfoControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\TestState.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\TextureControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\TextureToolControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\ToolsControl.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\UndoManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WidgetContainer.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WidgetCreatorManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WidgetSelectorManager.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WidgetTypes.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WidgetsWindow.cpp.obj Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir\WorkspaceControl.cpp.obj /out:bin\LayoutEditor.exe /implib:lib\LayoutEditor.lib /pdb:bin\LayoutEditor.pdb /version:0.0 /machine:x64 /nologo /debug /INCREMENTAL /subsystem:windows lib\MyGUICommon_d.lib F:\1\vcpkg\installed\x64-windows\lib\SDL2.lib winmm.lib imm32.lib version.lib setupapi.lib lib\MyGUI.DummyPlatform_d.lib lib\MyGUIEngineStatic_d.lib lib\EditorFrameworkStatic_d.lib lib\MyGUICommon_d.lib F:\1\vcpkg\installed\x64-windows\lib\SDL2.lib winmm.lib imm32.lib version.lib setupapi.lib lib\MyGUI.DummyPlatform_d.lib lib\MyGUIEngineStatic_d.lib F:\1\vcpkg\installed\x64-windows\debug\lib\freetyped.lib F:\1\vcpkg\installed\x64-windows\debug\lib\zlibd.lib kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir/intermediate.manifest Tools\LayoutEditor\CMakeFiles\LayoutEditor.dir/manifest.res" failed (exit code 1169) with the following output:
EditorFrameworkStatic_d.lib(ComponentFactory.cpp.obj) : error LNK2005: "public: __cdecl tools::BackgroundControl::BackgroundControl(void)" (??0BackgroundControl@tools@@QEAA@XZ) already defined in BackgroundControl.cpp.obj
EditorFrameworkStatic_d.lib(BackgroundControl.cpp.obj) : error LNK2005: "public: virtual __cdecl tools::BackgroundControl::~BackgroundControl(void)" (??1BackgroundControl@tools@@UEAA@XZ) already defined in BackgroundControl.cpp.obj

bin\LayoutEditor.exe : fatal error LNK1169: one or more multiply defined symbols found
```

Since the complete declaration of class `BackgroundControl` has been
included in the header file, `BackgroundControl` is removed from
`FACTORY_ITEM ` to avoid repeated function definitions.

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] ~~SHA512s are updated for each updated download.~~
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
 2024-04-25 09:20:33 -04:00
Jia Yue Hua
7da80835ac
[mygui] update to 3.4.3 (#35103) 
* [mygui] update to 3.4.3

* [mygui] update to 3.4.3
 2023-11-14 17:09:28 -08:00
Leonid Pospelov
c323ae9a97
[mygui] Update to 3.4.2 (#34006) 
* .

* .

* fixwasm32

* v

* fix gl

* version

* fix-static

* versions
 2023-09-28 23:25:29 -07:00
Lily Wang
5ad0fd26c1
[mygui] Fix feature tools build failed on macOS (#31082) 
* [mygui] Fix feature tools build failed on macOS

* update version
 2023-04-24 14:25:54 -07:00
autoantwort
4f18e877d3
[mygui] fix arm64-osx build (#27417) 2022-10-24 16:22:00 -07:00
Cheney Wang
842c72898a
[mygui] Add feature tools (#25228) 
* [mygui] Add feature tools

* x-add-version

* Test tools on CI

* overwrite-version

* Add the part of install tools to source's cmakefile

* x-add-version --overwrite-version

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
 2022-06-16 15:23:28 -07:00
Felipe Wannmacher
e3c42b4418
[sdl2-image] Support x64-uwp (#22437) 
* fixed 22434

* Clean baseline

* update version

* version

* add supports field since the upstream doesn't support uwp

* improve code

* version

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
 2022-01-10 13:15:07 -08:00
autoantwort
e15bfe6867
[mygui] no absolute paths (#22355) 2022-01-05 20:21:18 -08:00
Frank
a674f79ce9
[MyGUI] update to 3.4.1 (#22015) 
* [MyGUI] update to 3.4.1

* update version
 2021-12-14 10:47:59 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986) 
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
 2021-09-09 01:24:04 -07:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00