mirror of
https://github.com/Fishwaldo/open-zwave.git
synced 2025-03-15 11:31:40 +00:00
Windows RT is not Win32
This commit is contained in:
parent
700d941b4a
commit
6850565cf7
4 changed files with 19 additions and 14 deletions
20
Makefile
20
Makefile
|
@ -20,26 +20,26 @@ UNAME := $(shell uname)
|
|||
export UNAME
|
||||
|
||||
all:
|
||||
LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
|
||||
LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
|
||||
@LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
|
||||
@LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
|
||||
|
||||
install:
|
||||
$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
|
||||
clean:
|
||||
$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
|
||||
updateIndexDefines:
|
||||
$(MAKE) -C $(top_srcdir)/cpp/build -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/build -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
|
||||
test:
|
||||
$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
@$(MAKE) -C $(top_srcdir)/cpp/test/ -$(MAKEFLAGS) $(MAKECMDGOALS)
|
||||
|
||||
cpp/src/vers.cpp:
|
||||
LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp
|
||||
@LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp
|
||||
|
||||
check: xmltest
|
||||
|
||||
|
|
|
@ -66,8 +66,8 @@ LDFLAGS+= -lusb-1.0
|
|||
endif
|
||||
|
||||
$(OBJDIR)/MinOZW: $(patsubst %.cpp,$(OBJDIR)/%.o,$(minozwsrc))
|
||||
@echo "Linking $(OBJDIR)/MinOZW"
|
||||
$(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread
|
||||
@echo "Linking MinOZW"
|
||||
@$(LD) $(LDFLAGS) $(TARCH) -o $@ $< $(LIBS) -pthread
|
||||
|
||||
$(top_builddir)/MinOZW: $(top_srcdir)/cpp/examples/MinOZW/MinOZW.in $(OBJDIR)/MinOZW
|
||||
@echo "Creating Temporary Shell Launch Script"
|
||||
|
|
|
@ -37,11 +37,13 @@
|
|||
#include <sstream>
|
||||
#include <vector>
|
||||
#ifndef WIN32
|
||||
#ifndef WINRT
|
||||
#ifdef DEBUG
|
||||
#include <execinfo.h>
|
||||
#include <cxxabi.h>
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace OpenZWave
|
||||
{
|
||||
|
@ -153,7 +155,9 @@ namespace OpenZWave
|
|||
string intToString(int x);
|
||||
|
||||
const char* rssi_to_string(uint8 _data);
|
||||
|
||||
#ifndef WIN32
|
||||
#ifndef WINRT
|
||||
#ifdef DEBUG
|
||||
class StackTraceGenerator
|
||||
{
|
||||
|
@ -249,6 +253,7 @@ namespace OpenZWave
|
|||
}
|
||||
};
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
} // namespace Internal
|
||||
} // namespace OpenZWave
|
||||
|
|
4
dist/openzwave.spec
vendored
4
dist/openzwave.spec
vendored
|
@ -3,7 +3,7 @@
|
|||
%endif
|
||||
|
||||
Name: openzwave
|
||||
Version: 1.6.776
|
||||
Version: 1.6.777
|
||||
Release: 1.0%{?dist}
|
||||
Summary: Sample Executables for OpenZWave
|
||||
URL: http://www.openzwave.net
|
||||
|
@ -135,7 +135,7 @@ getent group zwave >/dev/null || groupadd -f -r zwave
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed May 08 2019 Justin Hammond <justin@dynam.ac> - 1.6.776
|
||||
* Wed May 08 2019 Justin Hammond <justin@dynam.ac> - 1.6.777
|
||||
- Update to new release of OpenZwave - 1.6
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.20180624git1e36dcc.0
|
||||
|
|
Loading…
Add table
Reference in a new issue