Skip to content

Commit

Permalink
Remove Qt rwviewer
Browse files Browse the repository at this point in the history
  • Loading branch information
danhedron committed May 28, 2019
1 parent cdea037 commit 3cdb030
Show file tree
Hide file tree
Showing 46 changed files with 3 additions and 2,522 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ add_subdirectory(rwcore)
add_subdirectory(rwengine)
add_subdirectory(rwgame)

if(BUILD_VIEWER)
add_subdirectory(rwviewer)
endif()
if(BUILD_TESTS)
enable_testing()
add_subdirectory(tests)
Expand Down
10 changes: 1 addition & 9 deletions cmake/ctest/build.ctest
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ set(_ARGS_BOOL
BUILD_TYPE
CHECK_IWYU
BUILD_TOOLS
BUILD_VIEWER

RUN_TESTS
SEPARATE_TEST_SUITES
Expand Down Expand Up @@ -121,17 +120,11 @@ if(USE_CONAN)
set(CONAN_CONFIGURATION "Release")
endif()

if(BUILD_VIEWER)
set(_BUILD_VIEWER True)
else()
set(_BUILD_VIEWER False)
endif()

execute_process(
COMMAND
"${CONAN_BIN}" install "${CTEST_SOURCE_DIRECTORY}"
-s arch=${CONAN_ARCH} -s build_type=${CONAN_CONFIGURATION}
-o viewer=${_BUILD_VIEWER} --build missing
--build missing
WORKING_DIRECTORY "${CTEST_BINARY_DIRECTORY}"
RESULT_VARIABLE RES
)
Expand Down Expand Up @@ -161,7 +154,6 @@ set(CTEST_CONFIGURATION_TYPE "${BUILD_TYPE}")

set(_CONFIGURE_OPTIONS
"-DBUILD_TOOLS=${BUILD_TOOLS}"
"-DBUILD_VIEWER=${BUILD_VIEWER}"
"-DBUILD_TESTS=TRUE"
"-DTEST_COVERAGE=${TEST_COVERAGE}"
"-DSEPARATE_TEST_SUITES=${SEPARATE_TEST_SUITES}"
Expand Down
1 change: 0 additions & 1 deletion cmake/ctest/configure_darwin.ctest
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ endif()
set(CONFIGURE_EXTRA_OPTIONS ";")
set(BUILD_EXTRA_FLAGS "")
set(BUILD_TOOLS TRUE)
set(BUILD_VIEWER TRUE)
set(CHECK_IWYU FALSE)
set(ENABLE_SANITIZERS "")

Expand Down
1 change: 0 additions & 1 deletion cmake/ctest/configure_linux.ctest
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ set(CONFIGURE_EXTRA_OPTIONS ";")
set(BUILD_EXTRA_FLAGS "")

set(BUILD_TOOLS TRUE)
set(BUILD_VIEWER TRUE)
set(CHECK_IWYU FALSE)
set(ENABLE_SANITIZERS "address")

Expand Down
1 change: 0 additions & 1 deletion cmake/ctest/configure_windows.ctest
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ set(BUILD_TYPE "${CONFIGURATION}")
set(CONAN_ARCH "x86_64")

set(BUILD_TOOLS TRUE)
set(BUILD_VIEWER TRUE)
set(CHECK_IWYU FALSE) #FIXME: ENABLE
set(ENABLE_SANITIZERS "")
1 change: 0 additions & 1 deletion cmake_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ option(RW_VERBOSE_DEBUG_MESSAGES "Print verbose debugging messages" ON)

option(BUILD_TOOLS "Build tools")
option(BUILD_TESTS "Build test suite")
option(BUILD_VIEWER "Build GUI data viewer")

option(ENABLE_SCRIPT_DEBUG "Enable verbose script execution")
option(ENABLE_PROFILING "Enable detailed profiling metrics")
Expand Down
18 changes: 1 addition & 17 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ class OpenrwConan(ConanFile):
description = "OpenRW 'Open ReWrite' is an un-official open source recreation of the classic Grand Theft Auto III game executable"
settings = 'os', 'compiler', 'build_type', 'arch'
options = {
'viewer': [True, False],
'tools': [True, False],
'profiling': [True, False],
}

default_options = {
'viewer': True,
'tools': True,
'profiling': True,
'bullet3:shared': False,
Expand All @@ -24,7 +22,7 @@ class OpenrwConan(ConanFile):

generators = 'cmake',
exports_sources = 'CMakeLists.txt', 'cmake_configure.cmake', 'cmake_options.cmake', 'CMakeCPack.cmake', 'COPYING', \
'cmake/modules/*', 'benchmarks', 'rwcore/*', 'rwengine/*', 'rwgame/*', 'rwviewer/*', \
'cmake/modules/*', 'benchmarks', 'rwcore/*', 'rwengine/*', 'rwgame/*', \
'rwtools/*', 'tests/*', 'external/*'

_rw_dependencies = {
Expand All @@ -36,24 +34,14 @@ class OpenrwConan(ConanFile):
'sdl2/2.0.9@bincrafters/stable',
'boost/1.68.0@conan/stable',
),
'viewer': (
'qt/5.12.0@bincrafters/stable',
),
'tools': (
'freetype/2.9.0@bincrafters/stable',
),
}

def configure(self):
if self.options.viewer:
self.options['qt'].opengl = 'desktop'

def requirements(self):
for dep in self._rw_dependencies['game']:
self.requires(dep)
if self.options.viewer:
for dep in self._rw_dependencies['viewer']:
self.requires(dep)
if self.options.tools:
for dep in self._rw_dependencies['tools']:
self.requires(dep)
Expand All @@ -64,7 +52,6 @@ def _configure_cmake(self):
'BUILD_SHARED_LIBS': False,
'CMAKE_BUILD_TYPE': self.settings.build_type,
'BUILD_TESTS': True,
'BUILD_VIEWER': self.options.viewer,
'BUILD_TOOLS': self.options.tools,
'ENABLE_PROFILING': self.options.profiling,
'USE_CONAN': True,
Expand All @@ -79,9 +66,6 @@ def build(self):
cmake.build()

def package(self):
if self.options.viewer:
# FIXME: https://github.com/osechet/conan-qt/issues/6 and https://github.com/conan-io/conan/issues/2619
self.copy('qt.conf', dst='bin', src='rwviewer')
cmake = self._configure_cmake()
cmake.install()

Expand Down
67 changes: 0 additions & 67 deletions rwviewer/CMakeLists.txt

This file was deleted.

37 changes: 0 additions & 37 deletions rwviewer/QOpenGLContextWrapper.cpp

This file was deleted.

28 changes: 0 additions & 28 deletions rwviewer/QOpenGLContextWrapper.hpp

This file was deleted.

3 changes: 0 additions & 3 deletions rwviewer/README.md

This file was deleted.

Loading

0 comments on commit 3cdb030

Please sign in to comment.