Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make Win64 build work directly from CMake. See README-WIN64.txt.
- Loading branch information
Showing
9 changed files
with
188 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| [Setup] | ||
|
|
||
| #define AppName "Agros2D" | ||
| #define AppVersion GetFileVersion("agros2d.exe") | ||
| #define AppDate GetFileDateTimeString("agros2d.exe", "mm/dd/yyyy", "/", ":") | ||
| #define OutputBaseFileName "Agros2D" + "_" + AppVersion + "." + GetDateTimeString('yyyymmdd', '', '') | ||
|
|
||
| AppName={#AppName} | ||
| AppVerName={#AppName} {#AppVersion} ({#AppDate}) | ||
| OutputBaseFilename={#OutputBaseFileName} | ||
| DefaultGroupName=Agros2D | ||
| LicenseFile=COPYING | ||
|
|
||
| AppId=Agros2D | ||
| AppPublisher=hpfem.org | ||
| AppCopyright=hpfem.org | ||
| AppPublisherURL=http://www.agros2d.org/ | ||
| AppMutex=Agros2D | ||
| OutputDir=setup | ||
| DefaultDirName={pf}\Agros2D | ||
| UninstallDisplayIcon={app}\images\agros2d.ico | ||
| Compression=lzma/max | ||
| PrivilegesRequired=admin | ||
|
|
||
| WizardImageFile=resources_source\images\setup\SetupModern.bmp | ||
| WizardSmallImageFile=resources_source\images\setup\SetupModernSmall.bmp | ||
|
|
||
| [Languages] | ||
|
|
||
| [Files] | ||
| Source: agros2d_util.dll; DestDir: {app}; DestName: agros2d_util.dll | ||
| Source: agros2d_pythonlab_library.dll; DestDir: {app}; DestName: agros2d_pythonlab_library.dll | ||
| Source: agros_pythonlab.exe; DestDir: {app}; DestName: PythonLab.exe | ||
| Source: agros2d_library.dll; DestDir: {app}; DestName: agros2d_library.dll | ||
| Source: libs\*.dll; DestDir: {app}/libs | ||
| Source: agros2d.exe; DestDir: {app}; DestName: Agros2D.exe | ||
| Source: agros2d_solver.exe; DestDir: {app}; DestName: Solver.exe | ||
| ;Source: agros2d_remote.exe; DestDir: {app}; DestName: Remote.exe | ||
| Source: solver_external.exe; DestDir: {app}; DestName: Solver_External.exe | ||
| Source: resources\images\agros2d.ico; DestDir: {app}; DestName: Agros2D.ico | ||
| Source: resources\*; DestDir: {app}/resources; Flags: recursesubdirs | ||
| Source: ..\agros2d-win64\*; DestDir: {app}; Flags: recursesubdirs | ||
| ; VC++ 2012 runtime | ||
| Source: "..\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall | ||
|
|
||
| [Icons] | ||
| Name: {group}\Agros2D; Filename: {app}\Agros2D.exe; WorkingDir: {app} | ||
| Name: {group}\Web pages; Filename: {app}\Agros2D.url | ||
| Name: {group}\COPYING; Filename: {app}\COPYING | ||
| Name: {group}\Uninstall; Filename: {uninstallexe} | ||
| Name: {commondesktop}\Agros2D; Filename: {app}\Agros2D.exe; WorkingDir: {app}; Tasks: desktopicon | ||
|
|
||
| [Tasks] | ||
| Name: desktopicon; Description: Create icon on desktop | ||
|
|
||
| [Run] | ||
| Filename: "{tmp}\vcredist_x64.exe" | ||
|
|
||
| [Registry] | ||
| ; a2d | ||
| Root: HKCR; SubKey: .a2d; ValueType: string; ValueData: Agros2D.Data; Flags: uninsdeletekey | ||
| Root: HKCR; SubKey: Agros2D.Data; ValueType: string; ValueData: Agros2D data file; Flags: uninsdeletekey | ||
| Root: HKCR; SubKey: Agros2D.Data\Shell\Open\Command; ValueType: string; ValueData: """{app}\Agros2D.exe"" -p ""%1"""; Flags: uninsdeletevalue | ||
| Root: HKCR; Subkey: Agros2D.Data\DefaultIcon; ValueType: string; ValueData: {app}\Agros2D.ico; Flags: uninsdeletevalue | ||
|
|
||
| [INI] | ||
| Filename: {app}\Agros2D.url; Section: InternetShortcut; Key: URL; String: http://www.agros2d.org/ | ||
|
|
||
| [UninstallDelete] | ||
| Type: files; Name: {app}\Agros2D.url | ||
|
|
||
| [Code] | ||
| #IFDEF UNICODE | ||
| #DEFINE AW "W" | ||
| #ELSE | ||
| #DEFINE AW "A" | ||
| #ENDIF | ||
| type | ||
| INSTALLSTATE = Longint; | ||
| const | ||
| INSTALLSTATE_INVALIDARG = -2; // An invalid parameter was passed to the function. | ||
| INSTALLSTATE_UNKNOWN = -1; // The product is neither advertised or installed. | ||
| INSTALLSTATE_ADVERTISED = 1; // The product is advertised but not installed. | ||
| INSTALLSTATE_ABSENT = 2; // The product is installed for a different user. | ||
| INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # - Try to find OpenGL | ||
| # Once done this will define | ||
| # | ||
| # OPENGL_FOUND - system has OpenGL | ||
| # OPENGL_XMESA_FOUND - system has XMESA | ||
| # OPENGL_GLU_FOUND - system has GLU | ||
| # OPENGL_INCLUDE_DIR - the GL include directory | ||
| # OPENGL_LIBRARIES - Link these to use OpenGL and GLU | ||
| # | ||
| # If you want to use just GL you can use these values | ||
| # OPENGL_gl_LIBRARY - Path to OpenGL Library | ||
| # OPENGL_glu_LIBRARY - Path to GLU Library | ||
| # | ||
| # On OSX default to using the framework version of opengl | ||
| # People will have to change the cache values of OPENGL_glu_LIBRARY | ||
| # and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX | ||
|
|
||
| #============================================================================= | ||
| # Copyright 2001-2009 Kitware, Inc. | ||
| # | ||
| # Distributed under the OSI-approved BSD License (the "License"); | ||
| # see accompanying file Copyright.txt for details. | ||
| # | ||
| # This software is distributed WITHOUT ANY WARRANTY; without even the | ||
| # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| # See the License for more information. | ||
| #============================================================================= | ||
| # (To distribute this file outside of CMake, substitute the full | ||
| # License text for the above reference.) | ||
|
|
||
| if (WIN32) | ||
| if (WIN64) | ||
| if(ZLIB_ROOT) | ||
| find_library(OPENGL_gl_LIBRARY opengl32 ${ZLIB_ROOT}) | ||
| find_library(OPENGL_glu_LIBRARY glu32 ${ZLIB_ROOT}) | ||
| else() | ||
| set (OPENGL_gl_LIBRARY opengl32 CACHE STRING "OpenGL library for win32") | ||
| set (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32") | ||
| endif() | ||
| endif() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters