Skip to content

Commit

Permalink
Fixed so Linux compiles after windows changes
Browse files Browse the repository at this point in the history 
pid file moved to /var/run/vscpd
  • Loading branch information
@grodansparadis
grodansparadis committed Jan 14, 2015
1 parent c173bb2 commit 0ea060a
Show file tree
Hide file tree
Showing 58 changed files with 949 additions and 317 deletions.
1 change: 1 addition & 0 deletions AUTHORS
View file
Expand Up @@ -7,3 +7,4 @@ David Bourgeois
Michael Stovenour
Kurt Herremans
Dinesh Guleria
Andreas Merkle
2 changes: 2 additions & 0 deletions src/common/net_skeleton.h
View file
Expand Up @@ -29,7 +29,9 @@
#define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+
#endif
#undef WIN32_LEAN_AND_MEAN // Let windows.h always include winsock2.h
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE 600 // For flockfile() on Linux
#endif
#define __STDC_FORMAT_MACROS // <inttypes.h> wants this for C++
#define __STDC_LIMIT_MACROS // C++ wants that for INT64_MAX
#ifndef _LARGEFILE_SOURCE
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/daemon/linux/Makefile.in
View file
Expand Up @@ -11,7 +11,7 @@ top_builddir = @top_builddir@
top_wxbuilddir = @top_wxbuilddir@
CXX = @CXX@
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = -DNOEMBED_NET_SKELETON @CPPFLAGS@
CPPFLAGS = -DNOEMBED_NET_SKELETON @CPPFLAGS@ -I../../common -I../../../common
LDFLAGS = @LDFLAGS@
EXTRALIBS = @EXTRALIBS@
STRIP = strip
Expand Down
105 changes: 104 additions & 1 deletion src/vscp/daemon/linux/nbproject/configurations.xml
View file
Expand Up @@ -130,7 +130,6 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
<Elem>NOEMBED_NET_SKELETON</Elem>
Expand All @@ -153,6 +152,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -163,18 +164,48 @@
</ccTool>
</item>
<item path="../../../common/crc.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/crc8.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/dllist.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/frozen.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/md5.cpp" ex="false" tool="1" flavor2="4">
<ccTool flags="0">
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -185,8 +216,22 @@
</ccTool>
</item>
<item path="../../../common/mongoose.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/net_skeleton.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/randPassword.cpp" ex="false" tool="1" flavor2="4">
<ccTool>
Expand All @@ -205,6 +250,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -215,14 +262,28 @@
</ccTool>
</item>
<item path="../../../common/slre.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../../common/v7.c" ex="false" tool="0" flavor2="2">
<cTool>
<incDir>
<pElem>.</pElem>
</incDir>
</cTool>
</item>
<item path="../../common/clientlist.cpp" ex="false" tool="1" flavor2="4">
<ccTool flags="0">
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -237,6 +298,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -251,6 +314,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -265,6 +330,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -279,6 +346,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -293,6 +362,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -307,6 +378,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -321,6 +394,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -335,6 +410,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -349,6 +426,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -363,6 +442,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -377,6 +458,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -391,6 +474,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand Down Expand Up @@ -419,6 +504,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -433,6 +520,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -449,6 +538,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -463,6 +554,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -477,6 +570,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -491,6 +586,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -505,6 +602,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
<pElem>.</pElem>
</incDir>
<preprocessorList>
Expand All @@ -519,6 +618,8 @@
<incDir>
<pElem>/usr/local/lib/wx/include/gtk2-unicode-3.0</pElem>
<pElem>/usr/local/include/wx-3.0</pElem>
<pElem>../../common</pElem>
<pElem>../../../common</pElem>
</incDir>
<preprocessorList>
<Elem>NOEMBED_NET_SKELETON</Elem>
Expand All @@ -528,6 +629,8 @@
</ccTool>
</folder>
<item path="vscpd.cpp" ex="false" tool="1" flavor2="4">
<ccTool flags="0">
</ccTool>
</item>
</conf>
</confs>
Expand Down

0 comments on commit 0ea060a

Please sign in to comment.