Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2.
sdl_common.c has lost some commits in the restructuring and those will need to be replayed over the restructured files for SDL1 and 2.
This commit is contained in:
@@ -26,6 +26,9 @@
|
||||
# CFLAGS
|
||||
SYSTEM_BUILD_CFLAGS=""
|
||||
|
||||
# CXXFLAGS
|
||||
SYSTEM_BUILD_CXXFLAGS=""
|
||||
|
||||
# LDFLAGS
|
||||
SYSTEM_BUILD_LDFLAGS=""
|
||||
|
||||
@@ -33,6 +36,9 @@ SYSTEM_BUILD_LDFLAGS=""
|
||||
BUILDTOOL_PREPROC_C_NAME="C preprocessor"
|
||||
BUILDTOOL_MKDEP_C_NAME="C dependency generator"
|
||||
BUILDTOOL_COMPILE_C_NAME="C compiler"
|
||||
BUILDTOOL_PREPROC_CXX_NAME="C++ preprocessor"
|
||||
BUILDTOOL_MKDEP_CXX_NAME="C++ dependency generator"
|
||||
BUILDTOOL_COMPILE_CXX_NAME="C++ compiler"
|
||||
BUILDTOOL_PREPROC_OBJC_NAME="Objective-C preprocessor"
|
||||
BUILDTOOL_MKDEP_OBJC_NAME="Objective-C dependency generator"
|
||||
BUILDTOOL_COMPILE_OBJC_NAME="Objective-C compiler"
|
||||
@@ -48,6 +54,15 @@ useGccBuildTools() {
|
||||
BUILDTOOL_COMPILE_C_COMMAND="\$PROG_gcc_FILE -c $EXTRA_PLATFORM_GCC_FLAGS_COMPILE_C"
|
||||
BUILDTOOL_COMPILE_C_DEPEND='gcc'
|
||||
|
||||
BUILDTOOL_PREPROC_CXX_COMMAND="\$PROG_gcc_FILE -E $EXTRA_PLATFORM_GCC_FLAGS_PREPROC_CXX"
|
||||
BUILDTOOL_PREPROC_CXX_DEPEND='gcc'
|
||||
|
||||
BUILDTOOL_MKDEP_CXX_COMMAND="\$PROG_gcc_FILE -MM $EXTRA_PLATFORM_GCC_FLAGS_MKDEP_CXX"
|
||||
BUILDTOOL_MKDEP_CXX_DEPEND='gcc'
|
||||
|
||||
BUILDTOOL_COMPILE_CXX_COMMAND="\$PROG_gcc_FILE -c $EXTRA_PLATFORM_GCC_FLAGS_COMPILE_CXX"
|
||||
BUILDTOOL_COMPILE_CXX_DEPEND='gcc'
|
||||
|
||||
BUILDTOOL_PREPROC_OBJC_COMMAND="\$PROG_gcc_FILE -E $EXTRA_PLATFORM_GCC_FLAGS_PREPROC_OBJC"
|
||||
BUILDTOOL_PREPROC_OBJC_DEPEND='gcc'
|
||||
|
||||
@@ -303,6 +318,12 @@ PROG_gcce_ACTION=""
|
||||
PROG_gcce_VERSION='$(arm-none-symbianelf-gcc --version)'
|
||||
|
||||
|
||||
### mingw-gcc ###
|
||||
PROG_mingw_gcc_NAME="GNU C MinGW Cross-compiler"
|
||||
PROG_mingw_gcc_FILE="i686-pc-mingw32-gcc"
|
||||
PROG_mingw_gcc_ACTION=""
|
||||
PROG_mingw_gcc_VERSION='$(i686-pc-mingw32-gcc --version)'
|
||||
|
||||
|
||||
##############################################################################
|
||||
# Describe the libaries (possibly) used: #
|
||||
|
||||
Reference in New Issue
Block a user