aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge /home/brukie/.VirtualBox/Machines/Windows XP/shared/cock_devel

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-02-25 14:56:12 +01:00
commit 50295b6e98
4 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -193,7 +193,7 @@ INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC}) ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC})
TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} ${PROTOBUF_LIBRARIES}) TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY})
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin)
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)

2
common/CMakeLists.txt
View file

@ -1,4 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
add_subdirectory(pb)
SET(common_SOURCES SET(common_SOURCES
decklist.cpp decklist.cpp
@ -42,7 +43,6 @@ INCLUDE_DIRECTORIES(sfmt)
INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(pb)
add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC}) add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC})
target_link_libraries(cockatrice_common cockatrice_protocol) 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}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
set(CMAKE_BUILD_TYPE Release)
add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
#target_link_libraries(${PROTOBUF_LIBRARIES}) target_link_libraries(cockatrice_protocol general $(PROTOBUF_LIBRARIES) general -lprotobuf)

44
nsis/cockatrice.nsi
View file

@ -31,30 +31,38 @@ InstallDir "$PROGRAMFILES\Cockatrice"
Section "Application" SecApplication Section "Application" SecApplication
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File ..\cockatrice\release\cockatrice.exe File ..\build\cockatrice\cockatrice.exe
File ..\oracle\release\oracle.exe File ..\build\oracle\oracle.exe
File data\libgcc_s_dw2-1.dll File C:\MinGW\bin\libstdc++-6.dll
File data\mingwm10.dll File C:\MinGW\bin\libgcc_s_dw2-1.dll
File data\QtCore4.dll File C:\MinGW\bin\mingwm10.dll
File data\QtGui4.dll File C:\MinGW\bin\libprotobuf-7.dll
File data\QtNetwork4.dll File C:\MinGW\bin\QtCore4.dll
File data\QtSvg4.dll File C:\MinGW\bin\QtGui4.dll
File data\QtXml4.dll File C:\MinGW\bin\QtNetwork4.dll
File data\QtMultimedia4.dll File C:\MinGW\bin\QtSvg4.dll
File data\QtScript4.dll File C:\MinGW\bin\QtXml4.dll
File C:\MinGW\bin\QtMultimedia4.dll
File C:\MinGW\bin\QtScript4.dll
SetOutPath "$INSTDIR\zonebg" SetOutPath "$INSTDIR\zonebg"
File /r ..\zonebg\*.* File /r ..\zonebg\*.*
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"
File /r data\plugins\*.* SetOutPath "$INSTDIR\plugins\codecs"
File C:\MinGW\plugins\codecs\qcncodecs4.dll
File C:\MinGW\plugins\codecs\qjpcodecs4.dll
File C:\MinGW\plugins\codecs\qkrcodecs4.dll
File C:\MinGW\plugins\codecs\qtwcodecs4.dll
SetOutPath "$INSTDIR\plugins\iconengines"
File C:\MinGW\plugins\iconengines\qsvgicon4.dll
SetOutPath "$INSTDIR\plugins\imageformats"
File C:\MinGW\plugins\imageformats\qjpeg4.dll
File c:\MinGW\plugins\imageformats\qsvg4.dll
SetOutPath "$INSTDIR\sounds" SetOutPath "$INSTDIR\sounds"
File /r ..\sounds\*.* File /r ..\sounds\*.*
SetOutPath "$INSTDIR\pics"
SetOutPath "$INSTDIR\decks"
WriteUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\uninstall.exe"
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
IntFmt $0 "0x%08X" $0 IntFmt $0 "0x%08X" $0
@ -83,13 +91,11 @@ Section Uninstall
RMDir /r "$INSTDIR\zonebg" RMDir /r "$INSTDIR\zonebg"
RMDir /r "$INSTDIR\plugins" RMDir /r "$INSTDIR\plugins"
RMDir /r "$INSTDIR\sounds" RMDir /r "$INSTDIR\sounds"
RMDir "$INSTDIR\decks"
RMDir /r "$INSTDIR\pics\downloadedPics"
RMDir "$INSTDIR\pics"
Delete "$INSTDIR\uninstall.exe" Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\cockatrice.exe" Delete "$INSTDIR\cockatrice.exe"
Delete "$INSTDIR\oracle.exe" Delete "$INSTDIR\oracle.exe"
Delete "$INSTDIR\cards.xml" Delete "$INSTDIR\libstdc++-6.dll"
Delete "$INSTDIR\libprotobuf-7.dll"
Delete "$INSTDIR\libgcc_s_dw2-1.dll" Delete "$INSTDIR\libgcc_s_dw2-1.dll"
Delete "$INSTDIR\mingwm10.dll" Delete "$INSTDIR\mingwm10.dll"
Delete "$INSTDIR\QtCore4.dll" Delete "$INSTDIR\QtCore4.dll"