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