Actually do what the previous change said

Forgot to actually exclude mod-null and mod-nyq-bench from the
build.

Fixed a few typos.

And removed "zip" from the package install on Ubuntu since it's
not needed anymore.
This commit is contained in:
Leland Lucius 2020-02-23 16:46:30 -06:00
parent f3ce60ae7a
commit d748c0816a
4 changed files with 6 additions and 6 deletions

View File

@ -249,7 +249,7 @@ jobs:
export LD_LIBRARY_PATH="/usr/local/lib"
# Install required packages
sudo apt-get install -y libgtk2.0-dev libasound2-dev gettext zip
sudo apt-get install -y libgtk2.0-dev libasound2-dev gettext
sudo apt-get remove -y ccache
# Build wxWidgets if needed

View File

@ -6,7 +6,7 @@ message( STATUS "========== Configuring ${TARGET} ==========" )
def_vars()
add_library( ${TARGET} MODULE )
add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
list( APPEND SOURCES
PRIVATE
@ -25,7 +25,7 @@ list( APPEND DEFINES
# the Windows pragmas are removed from ModNullCallback.cpp.
# Without it, the wxWidgets "debug.h" will define __WXDEBUG__
# which then causes this module to emit library pragmas for the
# debug versions of wxWidgets...even if the build if for Release.
# debug versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)

View File

@ -6,7 +6,7 @@ message( STATUS "========== Configuring ${TARGET} ==========" )
def_vars()
add_library( ${TARGET} MODULE )
add_library( ${TARGET} MODULE EXCLUDE_FROM_ALL )
list( APPEND SOURCES
PRIVATE
@ -25,7 +25,7 @@ list( APPEND DEFINES
# the Windows pragmas are removed from NyqBench.cpp. Without
# it, the wxWidgets "debug.h" will define __WXDEBUG__ which
# then causes this module to emit library pragmas for the debug
# versions of wxWidgets...even if the build if for Release.
# versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)

View File

@ -27,7 +27,7 @@ list( APPEND DEFINES
# the Windows pragmas are removed from ScripterCallback.cpp.
# Without it, the wxWidgets "debug.h" will define __WXDEBUG__
# which then causes this module to emit library pragmas for the
# debug versions of wxWidgets...even if the build if for Release.
# debug versions of wxWidgets...even if the build is for Release.
wxDEBUG_LEVEL=0
)