jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Windows fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-02-25 14:50:06 +01:00
parent 89c920479c
commit 96213fc3f3
4 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/CMakeLists.txt
View file

@ -1,4 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
add_subdirectory(pb)
SET(common_SOURCES
decklist.cpp
@ -42,7 +43,6 @@ INCLUDE_DIRECTORIES(sfmt)
INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(pb)
add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC})
target_link_libraries(cockatrice_common cockatrice_protocol)

4
common/pb/CMakeLists.txt
View file

@ -133,7 +133,5 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
set(CMAKE_BUILD_TYPE Release)
add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
#target_link_libraries(${PROTOBUF_LIBRARIES})
target_link_libraries(cockatrice_protocol general $(PROTOBUF_LIBRARIES) general -lprotobuf)