Permalink
Browse files

Fixed issues with windows

  • Loading branch information...
Braden McDorman
Braden McDorman committed Jan 8, 2013
1 parent 502f087 commit 6bd7291dc856d3cb01a00496ea7599971bf5e149
Showing with 8 additions and 2 deletions.
  1. +5 −0 CMakeLists.txt
  2. +3 −2 plugins/interfaces/shared/kovan_proto_target.hpp
View
@@ -88,7 +88,12 @@ ENDIF()
ADD_LIBRARY(kisside STATIC ${KISS_SRCS_CXX})
SET(EXECUTABLE_OUTPUT_PATH ${KISS_SOURCE_DIR}/deploy)
+IF(WIN32)
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/../prefix/lib)
+ELSE(WIN32)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
+ENDIF(WIN32)
+
TARGET_LINK_LIBRARIES(KISS ${QT_LIBRARIES} qscintilla2 pcompiler kar)
IF(APPLE)
@@ -5,17 +5,18 @@
#include <kar.hpp>
+#include <kovanserial/transmitter.hpp>
#include <kovanserial/transport_layer.hpp>
#include <kovanserial/kovan_serial.hpp>
#include <kovanserial/udp_advertiser.hpp>
-class Transmitter;
+#undef interface
namespace Kiss
{
namespace Target
{
- class KovanProtoTarget : public Target
+ class KovanProtoTarget : public Kiss::Target::Target
{
Q_OBJECT
public:

0 comments on commit 6bd7291

Please sign in to comment.