Skip to content

Commit

Permalink
PACKAGE_VERSION is defined now in general.h for all versions
Browse files Browse the repository at this point in the history
  • Loading branch information
inactive123 committed Jul 19, 2013
1 parent 627c30b commit b233792
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile.psl1ght
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Makefile.wii.salamander
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down
1 change: 0 additions & 1 deletion apple/RetroArch_OSX.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9.3\\\"",
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
Expand Down
4 changes: 0 additions & 4 deletions apple/RetroArch_iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9.3\\\"",
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_FBO",
Expand Down Expand Up @@ -416,7 +415,6 @@
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9.3\\\"",
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_FBO",
Expand Down Expand Up @@ -458,7 +456,6 @@
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9.3\\\"",
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
Expand Down Expand Up @@ -502,7 +499,6 @@
"-D__LIBRETRO__",
"-DRARCH_PERFORMANCE_MODE",
"-DRARCH_MOBILE",
"-DPACKAGE_VERSION=\\\"0.9.9.3\\\"",
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
Expand Down
2 changes: 1 addition & 1 deletion blackberry-qnx/bb10/RetroArch-Cascades.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh

PACKAGE_NAME=retroarch
PACKAGE_VERSION=0.9.9

cat /dev/null > config.log

Expand Down
2 changes: 0 additions & 2 deletions qb/qb.libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion qb/qb.params.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ print_help()
Quickbuild script
====================
Package: $PACKAGE_NAME
Version: $PACKAGE_VERSION
General environment variables:
CC: C compiler
Expand Down

0 comments on commit b233792

Please sign in to comment.