Skip to content

Commit

Permalink
Merge pull request #181 from NREL/develop
Browse files Browse the repository at this point in the history
Develop to main for 2024.12.12
  • Loading branch information
brtietz authored Dec 13, 2024
2 parents 8c1ebd3 + 824c11c commit 574f6fa
Show file tree
Hide file tree
Showing 20 changed files with 410 additions and 7,727 deletions.
360 changes: 322 additions & 38 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ option(SAM_SKIP_TOOLS "Skips the wex sandbox and Dview builds" OFF)
#

if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
endif ()

if (UNIX AND NOT CMAKE_C_COMPILER)
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# WEX: Extensions Library for wxWidgets
[![TravisCI](https://travis-ci.org/NREL/wex.svg?branch=develop)](https://travis-ci.org/NREL/wex)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgit.luolix.top%2FNREL%2Fwex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgit.luolix.top%2FNREL%2Fwex?ref=badge_shield)

WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model (SAM)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.
WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model (SAM)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.

WEX also includes two executable programs:

Expand Down
215 changes: 0 additions & 215 deletions include/wex/json_defs.h

This file was deleted.

Loading

0 comments on commit 574f6fa

Please sign in to comment.