moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-22 07:38:48 -05:00
Code Issues Releases Wiki Activity

Fix things for cross-compiling using mingw

Browse Source
This commit is contained in:
Perttu Ahola 2012-04-02 21:01:58 +03:00
parent 5bf06efb2a
commit 2cd5addc0c
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -7,10 +7,16 @@ endif(${CMAKE_VERSION} STREQUAL "2.8.2")
# This can be read from ${PROJECT_NAME} after project() is called # This can be read from ${PROJECT_NAME} after project() is called
project(minetest) project(minetest)
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 0) set(VERSION_MAJOR 0)
set(VERSION_MINOR 4) set(VERSION_MINOR 4)
set(VERSION_PATCH dev-20120326) if(VERSION_EXTRA)
set(VERSION_PATCH dev-20120326-${VERSION_EXTRA})
else()
set(VERSION_PATCH dev-20120326)
endif()
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***") MESSAGE(STATUS "*** Will build version ${VERSION_STRING} ***")

5
misc/winresource.rc Normal file
View File

@ -0,0 +1,5 @@
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
LANGUAGE 0, SUBLANG_NEUTRAL
130 ICON "minetest-icon.ico"

25
src/CMakeLists.txt
View File

@ -67,7 +67,7 @@ endif(ENABLE_SOUND AND BUILD_CLIENT)
if(SOUND_PROBLEM) if(SOUND_PROBLEM)
message(FATAL_ERROR "Sound enabled, but cannot be used.\n" message(FATAL_ERROR "Sound enabled, but cannot be used.\n"
"To continue, either fill in the required paths or disable sound.") "To continue, either fill in the required paths or disable sound. (-DENABLE_SOUND=0)")
endif() endif()
if(USE_SOUND) if(USE_SOUND)
set(sound_SRCS sound_openal.cpp) set(sound_SRCS sound_openal.cpp)
@ -205,14 +205,19 @@ set(common_SRCS
# This gives us the icon # This gives us the icon
if(WIN32) if(WIN32)
set(WINRESOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc)
if(MINGW) if(MINGW)
if(NOT CMAKE_RC_COMPILER)
set(CMAKE_RC_COMPILER "windres.exe")
endif()
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${CMAKE_RC_COMPILER} -I${CMAKE_CURRENT_SOURCE_DIR}
-i${CMAKE_CURRENT_SOURCE_DIR}/winresource.rc -i${WINRESOURCE_FILE}
-o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o) -o ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o) SET(common_SRCS ${common_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/winresource_rc.o)
else(MINGW) # Probably MSVC else(MINGW) # Probably MSVC
set(common_SRCS ${common_SRCS} winresource.rc) set(common_SRCS ${common_SRCS} ${WINRESOURCE_FILE})
endif(MINGW) endif(MINGW)
endif() endif()
@ -348,14 +353,18 @@ else()
set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable") set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING) endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
endif() endif()
if(MINGW)
set(OTHER_FLAGS "-mthreads -fexceptions")
endif()
if(APPLE) if(APPLE)
set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE) set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
set(ARCH i386) set(ARCH i386)
endif() endif()
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops") set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} ${OTHER_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS} ${OTHER_FLAGS}")
if(USE_GPROF) if(USE_GPROF)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")

6
src/winresource.rc
View File

@ -1,6 +0,0 @@
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
LANGUAGE 0, SUBLANG_NEUTRAL
130 ICON "..\\misc\\minetest-icon.ico"
//131 BITMAP "..\\misc\\minetest-icon.bmp"