Skip to content

Commit 35d1599

Browse files
NeoBrainXNeoBrainX
NeoBrainX
authored and
NeoBrainX
committed
Tag Dolphin 3.0
git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7615 8ced0084-cf51-0410-be5f-012b33b47a6e 3.0: Removed SVNRevGen stuff; changed revision string to 3.0; Removed installer since it was vastly outdated; Bumped CMake major version to 3 git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7616 8ced0084-cf51-0410-be5f-012b33b47a6e 3.0: Add the languages which were chosen to be release-worthy. Uhm, unless I forgot something important, I guess we can declare 3.0 as officially released now and stuff. Cheers ;) git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7617 8ced0084-cf51-0410-be5f-012b33b47a6e 3.0: Fix SCons build git-svn-id: https://dolphin-emu.googlecode.com/svn/tags/3.0@7627 8ced0084-cf51-0410-be5f-012b33b47a6e
1 parent 2d1fef2 commit 35d1599

17 files changed

+9
-787
lines changed

CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cmake_minimum_required(VERSION 2.6)
55
project(dolphin-emu)
66
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests)
7-
set(DOLPHIN_IS_STABLE FALSE)
7+
set(DOLPHIN_IS_STABLE TRUE)
88

99
# Set up paths
1010
set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
@@ -47,11 +47,6 @@ function(enable_precompiled_headers PRECOMPILED_HEADER SOURCE_FILE SOURCE_VARIAB
4747
endfunction(enable_precompiled_headers)
4848

4949

50-
include(FindSubversion OPTIONAL) # for revision info
51-
if(Subversion_FOUND AND NOT DOLPHIN_WC_REVISION)
52-
Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} DOLPHIN) # defines DOLPHIN_WC_REVISION
53-
endif()
54-
5550
# Various compile flags
5651
add_definitions(-msse2)
5752

@@ -406,8 +401,6 @@ endif(NOT DISABLE_WX)
406401
########################################
407402
# Pre-build events: Define configuration variables and write svnrev header
408403
#
409-
file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/svnrev.h
410-
"#define SVN_REV_STR \"" ${DOLPHIN_WC_REVISION} "-" ${CMAKE_BUILD_TYPE} "\"\n")
411404
include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src")
412405

413406

@@ -436,7 +429,7 @@ endif()
436429
# packaging information
437430
set(CPACK_PACKAGE_NAME "dolphin-emu")
438431
set(CPACK_PACKAGE_VENDOR "Dolphin Team")
439-
set(CPACK_PACKAGE_VERSION_MAJOR "2")
432+
set(CPACK_PACKAGE_VERSION_MAJOR "3")
440433
set(CPACK_PACKAGE_VERSION_MINOR "0")
441434

442435
if(DOLPHIN_IS_STABLE)

Installer/GetSVNRev.nsi

Lines changed: 0 additions & 11 deletions
This file was deleted.

Installer/Installer_win32.nsi

Lines changed: 0 additions & 243 deletions
This file was deleted.

0 commit comments

Comments
 (0)