0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tweaks to make things build on windows

Browse Source
This commit is contained in:
Petr Mrázek
2013-09-30 03:26:23 +02:00
parent 8b0f8b9e59
commit e45b444242
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -357,8 +357,8 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32
${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_QRC} ${MULTIMC_RCS}) ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_QRC} ${MULTIMC_RCS})
# Link # Link
QT5_USE_MODULES(MultiMC Widgets Network Xml) TARGET_LINK_LIBRARIES(MultiMC xz-embedded unpack200 quazip libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS})
TARGET_LINK_LIBRARIES(MultiMC quazip xz-embedded unpack200 libUtil libSettings libGroupView ${MultiMC_LINK_ADDITIONAL_LIBS}) QT5_USE_MODULES(MultiMC Core Widgets Network Xml)
ADD_DEPENDENCIES(MultiMC MultiMCLauncher) ADD_DEPENDENCIES(MultiMC MultiMCLauncher)

8
depends/pack200/CMakeLists.txt
View File

@@ -37,9 +37,13 @@ src/zip.cpp
src/zip.h src/zip.h
) )
SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
include_directories(include)
SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
include_directories(
include
${ZLIB_INCLUDE_DIRS}
)
add_library(unpack200 STATIC ${PACK200_SRC}) add_library(unpack200 STATIC ${PACK200_SRC})
IF(UNIX) IF(UNIX)

5
depends/pack200/src/zip.cpp
View File

@@ -48,7 +48,7 @@
#include "zip.h" #include "zip.h"
#include <zlib.h> #include "zlib.h"
inline uint32_t jar::get_crc32(uint32_t c, uchar *ptr, uint32_t len) inline uint32_t jar::get_crc32(uint32_t c, uchar *ptr, uint32_t len)
{ {
@@ -324,12 +324,13 @@ inline uint32_t jar::dostime(int y, int n, int d, int h, int m, int s)
: (((uint32_t)y - 1980) << 25) | ((uint32_t)n << 21) | ((uint32_t)d << 16) | : (((uint32_t)y - 1980) << 25) | ((uint32_t)n << 21) | ((uint32_t)d << 16) |
((uint32_t)h << 11) | ((uint32_t)m << 5) | ((uint32_t)s >> 1); ((uint32_t)h << 11) | ((uint32_t)m << 5) | ((uint32_t)s >> 1);
} }
/*
#ifdef _REENTRANT // solaris #ifdef _REENTRANT // solaris
extern "C" struct tm *gmtime_r(const time_t *, struct tm *); extern "C" struct tm *gmtime_r(const time_t *, struct tm *);
#else #else
#define gmtime_r(t, s) gmtime(t) #define gmtime_r(t, s) gmtime(t)
#endif #endif
*/
/* /*
* Return the Unix time in DOS format * Return the Unix time in DOS format
*/ */

2
depends/quazip/CMakeLists.txt
View File

@@ -32,7 +32,7 @@ ADD_DEFINITIONS(-DQUAZIP_STATIC)
#qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) #qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
#set(SRCS ${SRCS} ${MOC_SRCS}) #set(SRCS ${SRCS} ${MOC_SRCS})
set(CMAKE_POSITION_INDEPENDENT_CODE ON) #set(CMAKE_POSITION_INDEPENDENT_CODE ON)
add_library(quazip STATIC ${SRCS}) add_library(quazip STATIC ${SRCS})
QT5_USE_MODULES(quazip Core) QT5_USE_MODULES(quazip Core)