actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

1) Make GL_CFLAGS/XCFLAGS/XLIBS actually be respected 2) Include Windows resources in the build

Browse Source
This commit is contained in:
Ben "root" Anderson
2013-10-29 19:58:58 -05:00
parent b6dfe09253
commit 165168c05d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/m4/opengl.m4
-1
View File
@@ -41,5 +41,4 @@ AC_DEFUN([SM_OPENGL],
AC_CHECK_DECL(GLEW_VERSION_2_1, , AC_MSG_ERROR("GLEW 1.3.5 or newer is required."), [#include <GL/glew.h>]) AC_CHECK_DECL(GLEW_VERSION_2_1, , AC_MSG_ERROR("GLEW 1.3.5 or newer is required."), [#include <GL/glew.h>])
GL_LIBS="$GL_LIBS $GLU_LIBS $GLEW_LIBS" GL_LIBS="$GL_LIBS $GLU_LIBS $GLEW_LIBS"
AC_SUBST(GL_LIBS)
]) ])
configure.ac
+6
View File
@@ -30,6 +30,7 @@ if test "$host_os" = "mingw32"; then
# HACK: The prebuilts are 32bit only. Force the issue. # HACK: The prebuilts are 32bit only. Force the issue.
CFLAGS="$CFLAGS -m32" CFLAGS="$CFLAGS -m32"
CXXFLAGS="$CXXFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32"
RESFLAGS="$RESFLAGS --target=pe-i386"
fi fi
AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes") AM_CONDITIONAL(WITH_TTY, test "$with_tty" = "yes")
@@ -200,6 +201,9 @@ SM_X11
GL_CFLAGS="$GL_CFLAGS $XCFLAGS" GL_CFLAGS="$GL_CFLAGS $XCFLAGS"
GL_LIBS="$GL_LIBS $XLIBS" GL_LIBS="$GL_LIBS $XLIBS"
AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
have_libpng=yes have_libpng=yes
SM_STATIC SM_STATIC
AC_CHECK_LIB(png, png_create_read_struct, [x=y], have_libpng=no, [-lz -lm]) # x=y to stop autoconf from messing with LIBS AC_CHECK_LIB(png, png_create_read_struct, [x=y], have_libpng=no, [-lz -lm]) # x=y to stop autoconf from messing with LIBS
@@ -356,6 +360,8 @@ AM_CONDITIONAL(BUILD_TESTS, test "$enable_tests" = "yes" )
AC_ARG_ENABLE(lua-binaries, AS_HELP_STRING([--enable-lua-binaries],[Build lua and luac]), enable_lua_binaries=$enableval, enable_lua_binaries=no) AC_ARG_ENABLE(lua-binaries, AS_HELP_STRING([--enable-lua-binaries],[Build lua and luac]), enable_lua_binaries=$enableval, enable_lua_binaries=no)
AM_CONDITIONAL(BUILD_LUA_BINARIES, test "$enable_lua_binaries" = "yes" ) AM_CONDITIONAL(BUILD_LUA_BINARIES, test "$enable_lua_binaries" = "yes" )
AC_SUBST(RESFLAGS)
AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(src/Makefile) AC_CONFIG_FILES(src/Makefile)
AC_OUTPUT AC_OUTPUT
src/Makefile.am
+7 -1
View File
@@ -1,5 +1,10 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
# Windows resource files
# Using $^ here makes it add .dirstamp garbage as well. So just the first file please.
.rc.o:
windres $(RESFLAGS) $< $@
## Do not install stepmania in the traditional way. ## Do not install stepmania in the traditional way.
noinst_PROGRAMS = stepmania noinst_PROGRAMS = stepmania
TESTS = TESTS =
@@ -362,7 +367,8 @@ if WINDOWS
archutils/Win32/USB.cpp archutils/Win32/USB.h \ archutils/Win32/USB.cpp archutils/Win32/USB.h \
archutils/Win32/VideoDriverInfo.cpp archutils/Win32/VideoDriverInfo.h \ archutils/Win32/VideoDriverInfo.cpp archutils/Win32/VideoDriverInfo.h \
archutils/Win32/WindowIcon.cpp archutils/Win32/WindowIcon.h \ archutils/Win32/WindowIcon.cpp archutils/Win32/WindowIcon.h \
archutils/Win32/WindowsDialogBox.cpp archutils/Win32/WindowsDialogBox.h archutils/Win32/WindowsDialogBox.cpp archutils/Win32/WindowsDialogBox.h \
archutils/Win32/WindowsResources.rc archutils/Win32/WindowsResources.h
Dialog += arch/Dialog/DialogDriver_Win32.cpp arch/Dialog/DialogDriver_Win32.h Dialog += arch/Dialog/DialogDriver_Win32.cpp arch/Dialog/DialogDriver_Win32.h