Commit e33bd4b6 authored by Steve Lhomme's avatar Steve Lhomme

simplify the configure script by using the generic code in coremake

+ misc cleaning

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@413 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent ce7c5372
coremake:
$(CC) corec/tools/coremake/coremake.c -o coremake
corerc:
$(CC) corec/tools/coremake/corerc.c -o corerc
...@@ -271,7 +271,7 @@ int main(int argc, const char *argv[]) ...@@ -271,7 +271,7 @@ int main(int argc, const char *argv[])
stream *Input; stream *Input;
tchar_t Path[MAXPATHFULL]; tchar_t Path[MAXPATHFULL];
if (argc!=2 && argc!=3 || (argc==3 && strcmp(argv[1],"--pos"))) if ((argc!=2 && argc!=3) || (argc==3 && strcmp(argv[1],"--pos")))
{ {
fprintf(stderr, "Usage: mkvtree --pos [matroska_file]\r\n"); fprintf(stderr, "Usage: mkvtree --pos [matroska_file]\r\n");
fprintf(stderr, "Options:\r\n"); fprintf(stderr, "Options:\r\n");
......
...@@ -3,65 +3,9 @@ ...@@ -3,65 +3,9 @@
SCRIPT SCRIPT
%%END %%END
make -s -f coremake.mak coremake make -s -C corec/tools/coremake -f build.mak
mv -f corec/tools/coremake/coremake .
cpu_name=`uname -m | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/` coremake_param=`corec/tools/coremake/system_output.sh`
os_name=`uname -s | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/`
coremake_param="gcc_linux"
#echo "CPU" $cpu_name
#echo "OS" $os_name
case $os_name in
cygwin*)
coremake_param="gcc_linux"
;;
mingw* | pw32*)
coremake_param="gcc_win32"
;;
darwin* | rhapsody*)
case $cpu_name in
i*86)
coremake_param="gcc_osx_x86"
;;
powerpc*)
coremake_param="gcc_osx_ppc"
;;
x86_64)
coremake_param="gcc_osx_x64"
;;
esac
;;
freebsd* | kfreebsd*-gnu | dragonfly*)
coremake_param="gcc_linux"
;;
linux*)
case $cpu_name in
i*86)
coremake_param="gcc_linux"
;;
x86_64)
coremake_param="gcc_linux_x64"
;;
powerpc*)
coremake_param="gcc_linux_ppc"
;;
arm*)
coremake_param="gcc_linux_arm"
;;
mips*)
coremake_param="gcc_linux_mips"
;;
sparc64)
coremake_param="gcc_linux_sparc64"
;;
sparc*)
coremake_param="gcc_linux_sparc32"
;;
esac
;;
esac
echo "Running ./coremake" $coremake_param echo "Running ./coremake" $coremake_param
./coremake $coremake_param ./coremake $coremake_param
......
#define COREMAKE_STATIC #define COREMAKE_STATIC
#define COREMAKE_UNICODE #define COREMAKE_UNICODE
#define CONFIG_EBML_WRITING #define CONFIG_EBML_WRITING
#undef CONFIG_EBML_UNICODE
#define CONFIG_EBML_UNICODE #define CONFIG_EBML_UNICODE
#define HAVE_EBML2 #define HAVE_EBML2
#define CONFIG_MATROSKA2 #define CONFIG_MATROSKA2
......
%(!ROOTPATH)coremake.mak %(PROJECT_NAME)-%(PROJECT_VERSION)/coremake.mak
# corec # corec
%(!ROOTPATH)corec %(PROJECT_NAME)-%(PROJECT_VERSION)/corec %(!ROOTPATH)corec %(PROJECT_NAME)-%(PROJECT_VERSION)/corec
...@@ -24,6 +22,5 @@ ...@@ -24,6 +22,5 @@
Makefile - Makefile -
*.vcproj - *.vcproj -
*.sln - *.sln -
*.mak -
*_project.h - *_project.h -
*_stdafx.* - *_stdafx.* -
...@@ -3,65 +3,9 @@ ...@@ -3,65 +3,9 @@
SCRIPT SCRIPT
%%END %%END
make -s -f coremake.mak coremake make -s -C corec/tools/coremake -f build.mak
mv -f corec/tools/coremake/coremake .
cpu_name=`uname -m | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/` coremake_param=`corec/tools/coremake/system_output.sh`
os_name=`uname -s | sed y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/`
coremake_param="gcc_linux"
#echo "CPU" $cpu_name
#echo "OS" $os_name
case $os_name in
cygwin*)
coremake_param="gcc_linux"
;;
mingw* | pw32*)
coremake_param="gcc_win32"
;;
darwin* | rhapsody*)
case $cpu_name in
i*86)
coremake_param="gcc_osx_x86"
;;
powerpc*)
coremake_param="gcc_osx_ppc"
;;
x86_64)
coremake_param="gcc_osx_x64"
;;
esac
;;
freebsd* | kfreebsd*-gnu | dragonfly*)
coremake_param="gcc_linux"
;;
linux*)
case $cpu_name in
i*86)
coremake_param="gcc_linux"
;;
x86_64)
coremake_param="gcc_linux_x64"
;;
powerpc*)
coremake_param="gcc_linux_ppc"
;;
arm*)
coremake_param="gcc_linux_arm"
;;
mips*)
coremake_param="gcc_linux_mips"
;;
sparc64)
coremake_param="gcc_linux_sparc64"
;;
sparc*)
coremake_param="gcc_linux_sparc32"
;;
esac
;;
esac
echo "Running ./coremake" $coremake_param echo "Running ./coremake" $coremake_param
./coremake $coremake_param ./coremake $coremake_param
......
#define COREMAKE_STATIC #define COREMAKE_STATIC
#define COREMAKE_UNICODE #define COREMAKE_UNICODE
//#define CONFIG_EBML_WRITING //#define CONFIG_EBML_WRITING
#undef CONFIG_EBML_UNICODE
#define CONFIG_EBML_UNICODE #define CONFIG_EBML_UNICODE
#define HAVE_EBML2 #define HAVE_EBML2
#define CONFIG_MATROSKA2 #define CONFIG_MATROSKA2
...@@ -9,4 +10,4 @@ ...@@ -9,4 +10,4 @@
#define CONFIG_STDIO #define CONFIG_STDIO
#define CONFIG_FILEPOS_64 #define CONFIG_FILEPOS_64
#define COREMAKE_CONFIG_HELPER #define COREMAKE_CONFIG_HELPER
//#define CONFIG_DEBUG_LEAKS //#define CONFIG_DEBUG_LEAKS
\ No newline at end of file
%(!ROOTPATH)coremake.mak %(PROJECT_NAME)-%(PROJECT_VERSION)/coremake.mak
# corec # corec
%(!ROOTPATH)corec %(PROJECT_NAME)-%(PROJECT_VERSION)/corec %(!ROOTPATH)corec %(PROJECT_NAME)-%(PROJECT_VERSION)/corec
...@@ -24,6 +22,5 @@ ...@@ -24,6 +22,5 @@
Makefile - Makefile -
*.vcproj - *.vcproj -
*.sln - *.sln -
*.mak -
*_project.h - *_project.h -
*_stdafx.* - *_stdafx.* -
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment