diff --git a/v2/go.mod b/v2/go.mod index 3541d6382..e8db00b7e 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -26,7 +26,7 @@ require ( github.com/leaanthony/idgen v1.0.0 github.com/leaanthony/slicer v1.5.0 github.com/leaanthony/webview2runtime v1.1.0 - github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0 + github.com/leaanthony/winicon v1.0.0 github.com/matryer/is v1.4.0 github.com/olekukonko/tablewriter v0.0.4 github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2 diff --git a/v2/go.sum b/v2/go.sum index cd968b9cf..aa76b6241 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -137,8 +137,8 @@ github.com/leaanthony/synx v0.1.0/go.mod h1:Iz7eybeeG8bdq640iR+CwYb8p+9EOsgMWghk github.com/leaanthony/webview2runtime v1.1.0 h1:N0pv55ift8XtqozIp4PNOtRCJ/Qdd/qzx80lUpalS4c= github.com/leaanthony/webview2runtime v1.1.0/go.mod h1:hH9GnWCve3DYzNaPOcPbhHQ7fodXR1QJNsnwixid4Tk= github.com/leaanthony/wincursor v0.1.0/go.mod h1:7TVwwrzSH/2Y9gLOGH+VhA+bZhoWXBRgbGNTMk+yimE= -github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0 h1:FPGYnfxuuxqCZhrGq8nKjthEcYHgHmFbyY953Xv9cNI= -github.com/leaanthony/winicon v0.0.0-20200606125418-4419cea822a0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU= +github.com/leaanthony/winicon v1.0.0 h1:ZNt5U5dY71oEoKZ97UVwJRT4e+5xo5o/ieKuHuk8NqQ= +github.com/leaanthony/winicon v1.0.0/go.mod h1:en5xhijl92aphrJdmRPlh4NI1L6wq3gEm0LpXAPghjU= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k= diff --git a/v2/pkg/buildassets/buildassets.go b/v2/pkg/buildassets/buildassets.go index bc9b6c90c..138b387fd 100644 --- a/v2/pkg/buildassets/buildassets.go +++ b/v2/pkg/buildassets/buildassets.go @@ -6,7 +6,6 @@ import ( "github.com/leaanthony/gosod" "os" "path/filepath" - "text/template" ) //go:embed build @@ -33,40 +32,9 @@ func Install(targetDir string, projectName string) error { return err } - // Rename the rc file - rc := filepath.Join(windowsDir, "wails.rc") - targetFile = filepath.Join(windowsDir, projectName+".rc") - err = os.Rename(rc, targetFile) - if err != nil { - return err - } return nil } -// RegenerateRCFile will recreate the RC file -func RegenerateRCFile(projectDir string, projectName string) error { - targetFile, err := os.OpenFile(filepath.Join(projectDir, "build", "windows", projectName+".rc"), os.O_CREATE, 0644) - if err != nil { - return err - } - data := &assetData{Name: projectName} - templateData, err := assets.ReadFile("build/windows/wails.rc.tmpl") - if err != nil { - return err - } - - tmpl, err := template.New("rc").Parse(string(templateData)) - if err != nil { - return err - } - err = tmpl.Execute(targetFile, data) - if err != nil { - return err - } - return nil - -} - func RegenerateManifest(target string) error { a, err := debme.FS(assets, "build") if err != nil { diff --git a/v2/pkg/commands/build/packager_windows.go b/v2/pkg/commands/build/packager_windows.go index 85b395568..a9fd7743d 100644 --- a/v2/pkg/commands/build/packager_windows.go +++ b/v2/pkg/commands/build/packager_windows.go @@ -60,7 +60,7 @@ func generateIcoFile(options *Options) error { if err != nil { return err } - err = winicon.GenerateIcon(input, output, []int{256, 128, 64, 48, 32, 16}) + err = winicon.GenerateIcon(input, output, []int{512, 256, 128, 64, 48, 32, 16}) if err != nil { return err }