From 570e41f8e08d617c8635ffdb03ec52fb7d3f07f6 Mon Sep 17 00:00:00 2001 From: Danila Malyutin Date: Sat, 8 Aug 2015 00:53:39 +0300 Subject: [PATCH] Small fixes and improvments --- CMakeLists.txt | 3 +++ appveyor.yml | 3 +-- rpcs3/CMakeLists.txt | 11 +++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3abe8d579a..be3f3eb9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,4 +12,7 @@ if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8) endif() add_subdirectory( asmjit ) +# TODO: do real installation, including copying directory structure +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") add_subdirectory( rpcs3 ) diff --git a/appveyor.yml b/appveyor.yml index 68f90c6ef1..7b20d42178 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ before_build: - git submodule update --init --depth 3 asmjit minidx9 # until git for win 2.5 release with commit checkout - git submodule update --init ffmpeg - - 7z x wxWidgets.7z -aos -oC:\projects\rpcs3\wxWidgets + - 7z x wxWidgets.7z -aos -oC:\projects\rpcs3\wxWidgets > null - cmake -G "Visual Studio 14 Win64" build_script: @@ -21,7 +21,6 @@ build_script: install: - ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/wxWidgets.7z' -# - set wxWidgets_ROOT_DIR=C:\projects\rpcs3\wxWidgets; - set WXWIN=C:\projects\rpcs3\wxWidgets; - set OPENALDIR=C:\projects\rpcs3\OpenAL; - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\wxWidgets;%PATH% diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index a7039d21b0..2f9c389394 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -17,8 +17,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) message(FATAL_ERROR "GCC ${CMAKE_CXX_COMPILER_VERSION} is too old.") endif() # Warnings - add_definitions(-Wno-attributes -Wno-enum-compare) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof") + add_definitions(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof) elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # TODO: stdlib? endif() @@ -36,7 +35,7 @@ if (NOT MSVC) set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O1 -g -D_NDEBUG") add_definitions(-msse -msse2 -mcx16 -mssse3) else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHa /Zc:throwingNew /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1") endif() if (APPLE) @@ -55,7 +54,7 @@ else() set(ADDITIONAL_LIBS "") endif() -If( NOT RPCS3_SRC_DIR) +If(NOT RPCS3_SRC_DIR) SET(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}) Message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}") Else() @@ -63,8 +62,6 @@ Else() EndIf() set(CMAKE_MODULE_PATH "${RPCS3_SRC_DIR}/cmake_modules") -# TODO: do real installation, including copying directory structure -set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/../bin") if(NOT WIN32) add_definitions(-DGL_GLEXT_PROTOTYPES) @@ -76,8 +73,6 @@ if(NOT WIN32) find_package(GLEW REQUIRED) endif() find_package(OpenGL REQUIRED) -message(STATUS "OPENGL = ${OPENGL_LIBRARIES}") -message(STATUS "OPENGL_INCL = ${OPENGL_INCLUDE_DIR}") find_package(OpenAL REQUIRED) find_package(LLVM CONFIG)