ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-wiiuse-uninstallation'

Browse Source
This commit is contained in:
hiker 2019-01-20 01:45:31 +11:00
commit 7d688b241c
9 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
# root CMakeLists for the SuperTuxKart project
project(SuperTuxKart)
set(PROJECT_VERSION "git")
set(PROJECT_VERSION "0.10-beta1")
add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )
if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))

4
data/SuperTuxKart-Info.plist
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.1</string>
<string>0.10-beta1</string>
<key>CFBundleSignature</key>
<string>SPTK</string>
<key>CFBundleVersion</key>
<string>0.8.1</string>
<string>0.10-beta1</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSMinimumSystemVersion</key>

0
data/supertuxkart.git → data/supertuxkart.0.10-beta1
View File

2
lib/wiiuse/CMakeLists.txt
View File

@ -24,7 +24,7 @@ message(STATUS "Configuring WiiUse version ${CPACK_PACKAGE_VERSION}")
option(BUILD_EXAMPLE "Should we build the example app?" YES)
option(BUILD_EXAMPLE_SDL "Should we build the SDL-based example app?" YES)
option(BUILD_WIIUSE_SHARED_LIB "Should we build as a shared library (dll/so)?" YES)
option(BUILD_WIIUSE_SHARED_LIB "Should we build as a shared library (dll/so)?" NO)
option(INSTALL_EXAMPLES "Should we install the example apps?" YES)
option(CPACK_MONOLITHIC_INSTALL "Only produce a single component installer, rather than multi-component." NO)

2
src/io/file_manager.cpp
View File

@ -930,7 +930,7 @@ void FileManager::checkAndCreateConfigDir()
if(m_user_config_dir.size()>0 && *m_user_config_dir.rbegin()!='/')
m_user_config_dir += "/";
m_user_config_dir +="0.10-git/";
m_user_config_dir +="0.10-beta/";
if(!checkAndCreateDirectoryP(m_user_config_dir))
{
Log::warn("FileManager", "Can not create config dir '%s', "

BIN
tools/windows_installer/prerequisites/vcredist_x64.exe
View File

Binary file not shown.

BIN
tools/windows_installer/prerequisites/vcredist_x86.exe
View File

Binary file not shown.

9
tools/windows_installer/supertuxkart-64bit.nsi
View File

@ -32,10 +32,10 @@
; Version information
; TOOD get these from the source code directly
!define VERSION_MAJOR 0
!define VERSION_MINOR 9
!define VERSION_REVISION 3
!define VERSION_MINOR 10
!define VERSION_REVISION 0
; Empty means stable, could be -git, -rc1
!define VERSION_BUILD "-git"
!define VERSION_BUILD "-beta1"
;Name and file
!define APPNAME "SuperTuxKart"
@ -300,6 +300,9 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\libvorbis-0.dll"
DELETE /REBOOTOK "$INSTDIR\libvorbisenc-2.dll"
DELETE /REBOOTOK "$INSTDIR\libvorbisfile-3.dll"
DELETE /REBOOTOK "$INSTDIR\wiiuse.dll"
DELETE /REBOOTOK "$INSTDIR\wiiuse.ilk"
DELETE /REBOOTOK "$INSTDIR\wiiuse.pdb"
DELETE /REBOOTOK "$INSTDIR\wrap_oal.dll"
DELETE /REBOOTOK "$INSTDIR\zlib.dll"
DELETE /REBOOTOK "$INSTDIR\zlib.pdb"

9
tools/windows_installer/supertuxkart.nsi
View File

@ -32,10 +32,10 @@
; Version information
; TOOD get these from the source code directly
!define VERSION_MAJOR 0
!define VERSION_MINOR 9
!define VERSION_REVISION 3
!define VERSION_MINOR 10
!define VERSION_REVISION 0
; Empty means stable, could be -git, -rc1
!define VERSION_BUILD "-git"
!define VERSION_BUILD "-beta1"
;Name and file
!define APPNAME "SuperTuxKart"
@ -302,6 +302,9 @@ Section "Uninstall" redist
DELETE /REBOOTOK "$INSTDIR\libvorbis.dll"
DELETE /REBOOTOK "$INSTDIR\libvorbisenc.dll"
DELETE /REBOOTOK "$INSTDIR\libvorbisfile.dll"
DELETE /REBOOTOK "$INSTDIR\wiiuse.dll"
DELETE /REBOOTOK "$INSTDIR\wiiuse.ilk"
DELETE /REBOOTOK "$INSTDIR\wiiuse.pdb"
DELETE /REBOOTOK "$INSTDIR\wrap_oal.dll"
DELETE /REBOOTOK "$INSTDIR\zlib.dll"
DELETE /REBOOTOK "$INSTDIR\zlib.pdb"