MAC: various fixes

Author: mgerhardy

CMakeLists.txt

@@ -8,8 +8,6 @@ project(caveproductions)
 option(NETWORKING "Enable networking" ON)
 option(UNITTESTS "Builds with unittests" ON)
 option(TOOLS "Builds with tools" ON)
-option(VERBOSE "Print debug information" OFF)
-option(COVERAGE "Compile with test coverage" OFF)
 option(USE_CCACHE "Use ccache" ON)
 # The build system will search for system libs, if it can't find them (e.g. via pkg-config)
 # it will take those that are bundled under src/libs. If you don't want that for some reason,
@@ -40,36 +38,24 @@ if (BUILD_SHARED_LIBS)
 endif()
 
 set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "Root dir")
+
 message(STATUS "Place binaries in ${ROOT_DIR}")
 # First for the generic no-config case (e.g. with mingw)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${ROOT_DIR})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
-
 # Second, for multi-config builds (e.g. msvc)
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
 	string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${ROOT_DIR})
-	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
 endforeach()
+
 set(DEFAULT_LUAC_EXECUTABLE luac)
 set(CP_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake)
-set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED on)
 set(CMAKE_CXX_EXTENSIONS off)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-if (${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
-	message(STATUS "Generate eclipse projects")
-	set(CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES OFF)
-	set(CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT ON)
-	set(CMAKE_ECLIPSE_VERSION "4.3" CACHE STRING "Eclipse version")
-	set(CMAKE_CXX_COMPILER_ARG1 "-std=c++11" CACHE STRING "C++ version for Eclipse")
-endif()
-
 find_program(GDB_EXECUTABLE gdb)
 find_program(LLDB_EXECUTABLE lldb)
 if (GDB_EXECUTABLE)
@@ -84,17 +70,6 @@ set_property(CACHE DEBUGGER PROPERTY STRINGS gdb lldb)
 
 include(${CP_CMAKE_DIR}/macros.cmake)
 
-if (COVERAGE)
-	if ((CP_GCC OR CP_CLANG) AND NOT RELEASE)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-	elseif (RELEASE)
-		message(WARNING "Skip coverage, you attempt to compile in release mode")
-	else()
-		message(WARNING "Skip coverage, you don't compile with gcc or clang")
-	endif()
-endif()
-
 cp_message("ROOT_DIR: ${ROOT_DIR}")
 cp_message("CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
 cp_message("PROJECT_SOURCE_DIR: ${PROJECT_SOURCE_DIR}")

cmake/macros.cmake

@@ -707,10 +707,7 @@ macro(cp_add_executable)
 			if (_EXE_TPS)
 				textureatlas(PROJECTNAME ${_EXE_TARGET} FILELIST ${_EXE_TPS})
 			endif()
-			if (DARWIN)
-				cp_osx_add_target_properties(${_EXE_TARGET} ${APPNAME} ${VERSION} ${VERSION_CODE})
-				cp_osx_prepare_content(${_EXE_TARGET} OFF)
-			elseif (WINDOWS)
+			if (WINDOWS)
 				if (MSVC)
 					set_target_properties(${_EXE_TARGET} PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
 				endif()

contrib/scripts/android.sh

@@ -4,29 +4,17 @@ BUILD_TYPE=Release
 if [ "$ANDROID_RELEASE" == "OFF" ]; then
 	BUILD_TYPE=Debug
 fi
-INSTALL_PACKAGES=${ANDROID_INSTALL_PACKAGES:-ON}
 DIR=$(dirname $(readlink -f $0))
 cd $DIR/../../..
-echo "build non hd version"
 mkdir -p cp-build-android
 cd cp-build-android
 cmake $DIR/../.. -DTOOLS=OFF -DUNITTESTS=OFF \
-	-DANDROID_INSTALL_PACKAGES=${INSTALL_PACKAGES} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+	-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
 	-DCMAKE_TOOLCHAIN_FILE=$DIR/../../cmake/toolchains/android-toolchain.cmake
 make $*
-cd ..
-echo "build hd version"
-mkdir -p cp-build-android-hd
-cd cp-build-android-hd
-cmake $DIR/../.. -DTOOLS=OFF -DUNITTESTS=OFF -DANDROID_INSTALL_PACKAGES=${INSTALL_PACKAGES} \
-	-DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCAVEPACKER=OFF \
-	-DHD_VERSION=ON -DCMAKE_TOOLCHAIN_FILE=$DIR/../../cmake/toolchains/android-toolchain.cmake
-make $*
 
 STATE=$(${ANDROID_SDK_ROOT}/platform-tools/adb get-state)
 if [ "$STATE" == "device" ]; then
-	cd ../cp-build-android-hd
-	make android-caveexpress-install
 	cd ../cp-build-android
 	make android-caveexpress-install android-cavepacker-install
 fi

src/cavepacker/tests/BoardStateTest.cpp

@@ -686,7 +686,7 @@ TEST_F(BoardStateTest, testSpeed) {
 	const int maxRow = 512;
 	const int maxCol = 512;
 	mapStr.reserve(maxCol * maxRow);
-	int packages = 0;
+	// int packages = 0;
 	for (int row = 0; row < maxRow; ++row) {
 		for (int col = 0; col < maxCol; ++col) {
 			// build the outer rectangular wall
@@ -696,7 +696,7 @@ TEST_F(BoardStateTest, testSpeed) {
 				if (col % 5 <= 2 && row % 5 <= 2 && col < maxCol - 2 && row < maxRow - 2) {
 					mapStr.append("$");
 					mapStr.append(".");
-					++packages;
+					// ++packages;
 					++col;
 				}
 			}

src/tools/textureatlas/TextureAtlas.cpp

@@ -586,7 +586,7 @@ static void usage(const char *appname) {
 
 int main(int argc, char *argv[]) {
 	const char *appname = argv[0];
-	size_t optsParsed = 1;
+	int optsParsed = 1;
 	Config cfg;
 
 	for (optsParsed = 1; optsParsed < argc && argv[optsParsed][0] == '-'; optsParsed++) {