Skip to content

Commit

Permalink
Updated github links and added debug exe to installer
Browse files Browse the repository at this point in the history
  • Loading branch information
TeLiXj committed Dec 31, 2020
1 parent 72feed9 commit a1f73f4
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Official Website: https://ultrastar-es.org
-----------------

## Documentation
Visit our [Wiki](https://github.com/ultrastares/usdxworldparty/wiki) to get help about how to compile the game, see changelog, etc..
Visit our [Wiki](https://github.com/ultrastares/ultrastar-worldparty/wiki) to get help about how to compile the game, see changelog, etc..

## Support and contact
Visit our [official website](https://ultrastar-es.org) where you can find tutorials, songs, contests and more
Expand Down
22 changes: 11 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AC_PREREQ(2.61)
# Init autoconf
AC_INIT([WorldParty],
m4_esyscmd_s([cat VERSION]),
[https://github.com/ultrastares/usdxworldparty/])
[https://github.com/ultrastares/ultrastar-worldparty/])
# specify the website here
PACKAGE_WEBSITE="https://ultrastar-es.org/"
AC_SUBST(PACKAGE_WEBSITE)
Expand Down Expand Up @@ -75,7 +75,7 @@ AC_ARG_WITH([cfg-dummy1], [
External Libraries:])

# add projectM option
AC_ARG_WITH([libprojectM],
AC_ARG_WITH([libprojectM],
[AS_HELP_STRING([--with-libprojectM],
[enable projectM visualization support @<:@default=no@:>@])],
[with_libprojectM=$withval], [with_libprojectM="no"])
Expand Down Expand Up @@ -141,7 +141,7 @@ if [[ "$FPC_VERSION_MAJOR" -lt 3 ]]; then
!!! fpc (the free Pascal compiler) is required in at least
!!! version 3.0.0, but only version $FPC_VERSION was found.
!!! Please install a newer fpc version.
])
])
fi

# find and test the C compiler (for C-libs and wrappers)
Expand All @@ -154,7 +154,7 @@ AC_PROG_RANLIB
PKG_PROG_PKG_CONFIG()
if [[ x$PKG_CONFIG = x ]]; then
AC_MSG_ERROR([
!!! pkg-config was not found on your system.
!!! pkg-config was not found on your system.
!!! It is needed to determine the versions of your libraries.
!!! Install it and try again.])
fi
Expand Down Expand Up @@ -185,7 +185,7 @@ PKG_HAVE([freetype], [freetype2], yes)
PKG_HAVE([sqlite3], [sqlite3], yes)

# find lua 5.3, 5.2 or 5.11
# (K)Ubuntu uses lua5.2.pc and lua5.1.pc,
# (K)Ubuntu uses lua5.2.pc and lua5.1.pc,
# Mac OS X and other linux distributions use lua.pc
# Archlinux aur package for 5.3 use lua5.3.pc in order
# to make it work alongside the 5.2 version.
Expand Down Expand Up @@ -223,15 +223,15 @@ AC_MSG_RESULT([$LUA_INTEGER_BITS bits])

# find FFMpeg
# Note: do not use the min/max version parameters with ffmpeg
# otherwise it might fail in ubuntu due to a wrong version number
# otherwise it might fail in ubuntu due to a wrong version number
# format in ffmpeg's .pc-files.
# For example: 0d.51.1.2 instead of the correct 51.1.2.
# A check for version >=52.0.0 will return version 0d.51.1.2
# A check for version >=52.0.0 will return version 0d.51.1.2
# although it is lower because pkg-config is confused by the 0d.
# Use [mylib]_VERSION_INT for version-checking instead
PKG_HAVE([libavcodec], [libavcodec], check)
# The following finds libavcodec.pc in its new location on Mac OS X.
# It only takes the last from the list, assuming that this is the latest
# It only takes the last from the list, assuming that this is the latest
# version.
if [[ x$libavcodec_HAVE = xno -a x$FPC_PLATFORM = xdarwin ]]; then
if [[ x$enable_osx_fink != x ]]; then
Expand Down Expand Up @@ -331,10 +331,10 @@ PKG_HAVE([libprojectM], [$libprojectM_PKG], no)
PKG_VERSION([libprojectM], [$libprojectM_PKG])
AC_SUBST_DEFINE(HAVE_PROJECTM, $libprojectM_HAVE)
# get projectM include-dir
PKG_VALUE([libprojectM], [INCLUDEDIR], [variable=includedir], [$libprojectM_PKG],
PKG_VALUE([libprojectM], [INCLUDEDIR], [variable=includedir], [$libprojectM_PKG],
[C-Header include-dir (e.g. /usr/include)])
# get projectM data-dir (for preset- and font-dir)
PKG_VALUE([libprojectM], [DATADIR], [variable=pkgdatadir], [$libprojectM_PKG],
PKG_VALUE([libprojectM], [DATADIR], [variable=pkgdatadir], [$libprojectM_PKG],
[projectM data-directory for presets etc. (e.g. /usr/share/projectM)])
# check if we need the c-wrapper
if [[ "$libprojectM_VERSION_MAJOR" -ge 1 ]]; then
Expand Down Expand Up @@ -387,7 +387,7 @@ AC_MSG_NOTICE([
!!!
!!! Configuration of $PACKAGE_NAME $PACKAGE_VERSION done!
!!!
!!! Type "make" to compile and
!!! Type "make" to compile and
!!! "make install" to install it afterwards.
!!!
!!! For further information on $PACKAGE_NAME visit:
Expand Down
3 changes: 2 additions & 1 deletion installer/settings/files_main_install.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CreateDirectory $INSTDIR\avatars
${If} $UseAppData == true

; Create folders in appdata for current user
SetShellVarContext current
SetShellVarContext current
CreateDirectory $UserDataPath
CreateDirectory $UserDataPath\screenshots
CreateDirectory $UserDataPath\playlists
Expand Down Expand Up @@ -57,6 +57,7 @@ File /r /x .svn /x .gitignore ..\game\licenses
File ..\game\*.dll
File ..\game\Readme.txt
File ..\game\WorldParty.exe
File ..\game\WorldPartyDebug.exe

; Covers dir:

Expand Down
10 changes: 5 additions & 5 deletions installer/settings/files_main_uninstall.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

; Delete remaining files
Delete "$INSTDIR\${exe}.exe"
Delete "$INSTDIR\${exeupdate}.exe"
Delete "$INSTDIR\${exe_debug}.exe"
Delete "$INSTDIR\Readme.txt"
Delete "$INSTDIR\screenshots.lnk"
Delete "$INSTDIR\playlists.lnk"
Delete "$INSTDIR\config.ini.lnk"

Delete "$INSTDIR\Error.log"
Delete "$INSTDIR\cover.db"
Delete "$INSTDIR\avatar.db"
Expand All @@ -32,7 +32,7 @@


StrCpy $0 "$INSTDIR\songs"
Call un.DeleteIfEmpty
Call un.DeleteIfEmpty

StrCpy $0 "$INSTDIR\covers"
Call un.DeleteIfEmpty
Expand All @@ -50,7 +50,7 @@
Delete "$APPDATA\WorldParty\Error.log"
Delete "$APPDATA\WorldParty\cover.db"
Delete "$APPDATA\WorldParty\avatar.db"

StrCpy $0 "$APPDATA\WorldParty\covers"
Call un.DeleteIfEmpty

Expand All @@ -73,4 +73,4 @@
Delete "$INSTDIR\${exeuninstall}.exe"

StrCpy $0 "$INSTDIR"
Call un.DeleteIfEmpty
Call un.DeleteIfEmpty
12 changes: 6 additions & 6 deletions installer/settings/variables.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

; Product Information:

!define VersionStr "21.1"
!define FullVersion "21.1"
!define VersionStr "20.12"
!define FullVersion "20.12"

!define installername " Installer"
!define installerexe "WorldParty ${VersionStr} installer"
Expand All @@ -20,20 +20,20 @@
!define publisher "UltraStar España"
!define homepage "https://ultrastar-es.org"
!define forum "https://ultrastar-es.org/foro"
!define wiki "https://github.com/ultrastares/usdxworldparty/wiki"
!define wiki "https://github.com/ultrastares/ultrastar-worldparty/wiki"

!define exe "WorldParty"
!define exe_debug "WorldPartyDebug"
!define exeuninstall "Uninstall"
!define exeupdate "Update"

!define license ".\dependencies\documents\license.txt"

; Installer

!define installer_version_path "$LOCALAPPDATA\Temp\WorldParty"
!define installer_exe_path "$LOCALAPPDATA\Temp\WorldPartyupdate.exe"
;!define version_url "https://github.com/ultrastares/usdxworldparty/blob/master/VERSION"
;!define update_url "https://github.com/ultrastares/usdxworldparty/releases/download/%VERSION%/UltraStar.Deluxe.WorldParty_%VERSIONSTRING%-installer.exe"
;!define version_url "https://github.com/ultrastares/ultrastar-worldparty/blob/master/VERSION"
;!define update_url "https://github.com/ultrastares/ultrastar-worldparty/releases/download/%VERSION%/UltraStar.Deluxe.WorldParty_%VERSIONSTRING%-installer.exe"
!define update_mask_online_version "%VERSION%"
!define update_mask_installer_version "%VERSIONSTRING%"

Expand Down

0 comments on commit a1f73f4

Please sign in to comment.