From b23379266cf150f3f6060ce5d638fb7c4975df1e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jul 2013 16:20:14 +0200 Subject: [PATCH] PACKAGE_VERSION is defined now in general.h for all versions --- Makefile.psl1ght | 2 +- Makefile.wii.salamander | 2 +- Makefile.win | 2 +- apple/RetroArch_OSX.xcodeproj/project.pbxproj | 1 - apple/RetroArch_iOS.xcodeproj/project.pbxproj | 4 ---- blackberry-qnx/bb10/RetroArch-Cascades.pro | 2 +- configure | 1 - qb/qb.libs.sh | 2 -- qb/qb.params.sh | 1 - 9 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 18e89222baad..8ad965e3bf3c 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -92,7 +92,7 @@ endif RSXGL_DEFINES = -D__RSX__ -DGL3_PROTOTYPES -SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DRARCH_CONSOLE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPACKAGE_VERSION=\"0.9.8\" -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts +SHARED_FLAGS := -DHAVE_FILEBROWSER $(RSXGL_DEFINES) -DHAVE_OPENGL -DHAVE_EGL -DHAVE_OPENGL_MODERN -DHAVE_GLSL -DHAVE_VID_CONTEXT -DHAVE_FBO -DHAVE_MOUSE -DRARCH_CONSOLE -DHAVE_ZLIB -DWANT_MINIZ -DHAVE_RARCH_MAIN_WRAP -DHAVE_RARCH_MAIN_IMPLEMENTATION -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_GRIFFIN=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -Wno-char-subscripts CFLAGS += -std=gnu99 $(SHARED_FLAGS) CXXFLAGS += $(SHARED_FLAGS) diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 1356a4ac3bdb..87049c1d5c44 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -53,7 +53,7 @@ CFLAGS += -DHAVE_FILE_LOGGER CFLAGS += -Iconsole/logger endif -CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -DPACKAGE_VERSION=\"0.9.8\" -Wno-char-subscripts +CFLAGS += -std=gnu99 -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_RARCH_EXEC -DGEKKO -Wno-char-subscripts ifeq ($(DEBUG), 1) CFLAGS += -O0 -g diff --git a/Makefile.win b/Makefile.win index 0c5f24d416c9..862bb534ca91 100644 --- a/Makefile.win +++ b/Makefile.win @@ -77,7 +77,7 @@ endif libretro ?= -lretro LIBS = -lm -DEFINES = -I. -DHAVE_SCREENSHOTS -DHAVE_BSV_MOVIE -DPACKAGE_VERSION=\"0.9.9.3\" +DEFINES = -I. -DHAVE_SCREENSHOTS -DHAVE_BSV_MOVIE LDFLAGS = -L. -static-libgcc ifeq ($(TDM_GCC),) diff --git a/apple/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/RetroArch_OSX.xcodeproj/project.pbxproj index 969c10954653..e4b16ceb4ab1 100644 --- a/apple/RetroArch_OSX.xcodeproj/project.pbxproj +++ b/apple/RetroArch_OSX.xcodeproj/project.pbxproj @@ -354,7 +354,6 @@ "-D__LIBRETRO__", "-DRARCH_PERFORMANCE_MODE", "-DRARCH_MOBILE", - "-DPACKAGE_VERSION=\\\"0.9.9.3\\\"", "-DHAVE_COREAUDIO", "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", diff --git a/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/RetroArch_iOS.xcodeproj/project.pbxproj index 9777b46c4d02..15081fd2eb2c 100644 --- a/apple/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/RetroArch_iOS.xcodeproj/project.pbxproj @@ -365,7 +365,6 @@ "-D__LIBRETRO__", "-DRARCH_PERFORMANCE_MODE", "-DRARCH_MOBILE", - "-DPACKAGE_VERSION=\\\"0.9.9.3\\\"", "-std=gnu99", "-DHAVE_COREAUDIO", "-DHAVE_FBO", @@ -416,7 +415,6 @@ "-D__LIBRETRO__", "-DRARCH_PERFORMANCE_MODE", "-DRARCH_MOBILE", - "-DPACKAGE_VERSION=\\\"0.9.9.3\\\"", "-std=gnu99", "-DHAVE_COREAUDIO", "-DHAVE_FBO", @@ -458,7 +456,6 @@ "-D__LIBRETRO__", "-DRARCH_PERFORMANCE_MODE", "-DRARCH_MOBILE", - "-DPACKAGE_VERSION=\\\"0.9.9.3\\\"", "-DHAVE_COREAUDIO", "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", @@ -502,7 +499,6 @@ "-D__LIBRETRO__", "-DRARCH_PERFORMANCE_MODE", "-DRARCH_MOBILE", - "-DPACKAGE_VERSION=\\\"0.9.9.3\\\"", "-DHAVE_COREAUDIO", "-DHAVE_DYNAMIC", "-DHAVE_OVERLAY", diff --git a/blackberry-qnx/bb10/RetroArch-Cascades.pro b/blackberry-qnx/bb10/RetroArch-Cascades.pro index 5b81e367d5c1..1f9eb1dfba14 100644 --- a/blackberry-qnx/bb10/RetroArch-Cascades.pro +++ b/blackberry-qnx/bb10/RetroArch-Cascades.pro @@ -9,7 +9,7 @@ DEFINES += HAVE_RGUI HAVE_NEON RARCH_MOBILE \ SINC_LOWER_QUALITY HAVE_RARCH_MAIN_IMPLEMENTATION \ HAVE_VID_CONTEXT HAVE_FBO HAVE_GRIFFIN __LIBRETRO__ \ HAVE_DYNAMIC HAVE_ZLIB __BLACKBERRY_QNX__ HAVE_OPENGLES \ - PACKAGE_VERSION=\"0.9.9\" HAVE_OPENGLES2 HAVE_NULLINPUT \ + HAVE_OPENGLES2 HAVE_NULLINPUT \ HAVE_AL HAVE_THREADS WANT_MINIZ HAVE_OVERLAY HAVE_GLSL \ USING_GL20 HAVE_OPENGL __STDC_CONSTANT_MACROS HAVE_BB10 diff --git a/configure b/configure index 5edfff9e4f7c..3d6cb624c0d2 100755 --- a/configure +++ b/configure @@ -1,7 +1,6 @@ #!/bin/sh PACKAGE_NAME=retroarch -PACKAGE_VERSION=0.9.9 cat /dev/null > config.log diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index f2d22642cde3..f58ede455cba 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -200,7 +200,6 @@ create_config_header() echo "#define $name" echo "" echo "#define PACKAGE_NAME \"$PACKAGE_NAME\"" - echo "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" while [ "$1" ]; do case $(eval echo \$HAVE_$1) in @@ -234,7 +233,6 @@ create_config_make() echo "INCLUDE_DIRS = $INCLUDE_DIRS" echo "LIBRARY_DIRS = $LIBRARY_DIRS" echo "PACKAGE_NAME = $PACKAGE_NAME" - echo "PACKAGE_VERSION = $PACKAGE_VERSION" echo "PREFIX = $PREFIX" while [ "$1" ]; do diff --git a/qb/qb.params.sh b/qb/qb.params.sh index 2ef923389176..9f8f1800720c 100644 --- a/qb/qb.params.sh +++ b/qb/qb.params.sh @@ -5,7 +5,6 @@ print_help() Quickbuild script ==================== Package: $PACKAGE_NAME -Version: $PACKAGE_VERSION General environment variables: CC: C compiler