Remove posix dir and 'libposix' and create 'libresrc' which includes

resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
This commit is contained in:
Amar Takhar 2009-01-04 09:01:49 +00:00
parent bf671135e9
commit bf09c76081
8 changed files with 18 additions and 35 deletions

View File

@ -8,12 +8,12 @@ libosxutil_lib = libosxutil/libosxutil.a
libosxutil_ldflags = -framework CoreFoundation libosxutil_ldflags = -framework CoreFoundation
endif endif
SUBDIRS = bitmaps posix $(libosxutil_subdir) SUBDIRS = bitmaps libresrc $(libosxutil_subdir)
AM_CXXFLAGS = -DAEGISUB -Iposix -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@
bin_PROGRAMS = aegisub bin_PROGRAMS = aegisub
aegisub_LDADD = posix/libposix.a $(libosxutil_lib) aegisub_LDADD = libresrc/libresrc.a $(libosxutil_lib)
aegisub_CPPFLAGS = @FREETYPE_CFLAGS@ aegisub_CPPFLAGS = @FREETYPE_CFLAGS@
aegisub_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags) aegisub_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags)
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@

View File

@ -10,6 +10,6 @@
// Unix specific settings and defines. // Unix specific settings and defines.
#include "config/config_unix.h" #include "config/config_unix.h"
#include "posix/res.h" #include "libresrc/libresrc.h"
#endif // __WINDOWS__ #endif // __WINDOWS__

View File

@ -0,0 +1,3 @@
noinst_LIBRARIES = libresrc.a
nodist_libresrc_a_SOURCES = resrc.cpp
noinst_HEADERS = libresrc.h

View File

@ -1,3 +0,0 @@
noinst_LIBRARIES = libposix.a
nodist_libposix_a_SOURCES = res.cpp
EXTRA_DIST = genres.sh defines.h res.cpp res.h config.h

View File

@ -1,16 +0,0 @@
#!/bin/sh
RESFILE="$1"
egrep -v "\.cur|^(#|/|$)" $RESFILE | cut -d ' ' -f 1 | (
echo "#define static" >&4
echo "#ifndef _RES_H" >&5
echo "#define _RES_H" >&5
while read NAME
do echo "extern char *${NAME}_xpm[];" >&5
echo "#include \"../bitmaps/${NAME}_xpm.xpm\"" >&4
done
echo "#endif /* _RES_H */" >&5
) 4>res.cpp 5>res.h

View File

@ -294,11 +294,10 @@ $BIN_AWK '/BITMAP/ { image[count] = $1; ++count} END { printf("EXTRA_DIST= \\\n
${srcdir}/aegisub/res.rc \ ${srcdir}/aegisub/res.rc \
> ${srcdir}/aegisub/bitmaps/Makefile.am > ${srcdir}/aegisub/bitmaps/Makefile.am
echo "--- Generating res.cpp / res.h from res.rc ---" echo "--- Generating libresrc/resrc.cpp, libresrc/resrc.h from res.rc ---"
# XXX: This needs replacing. $BIN_AWK -f scripts/unix-gen-res.awk ${srcdir}/aegisub/res.rc \
cd ${srcdir}/aegisub/posix RESRC_CPP="${srcdir}/aegisub/libresrc/resrc.cpp" \
sh genres.sh ${srcdir}/aegisub/res.rc RESRC_H="${srcdir}/aegisub/libresrc/resrc.h"
cd ${srcdir}
rm -rf autom4te.cache rm -rf autom4te.cache

View File

@ -958,7 +958,7 @@ AC_CONFIG_FILES([
Makefile Makefile
aegisub/Makefile aegisub/Makefile
aegisub/bitmaps/Makefile aegisub/bitmaps/Makefile
aegisub/posix/Makefile aegisub/libresrc/Makefile
aegisub/libosxutil/Makefile aegisub/libosxutil/Makefile
universalchardet/Makefile universalchardet/Makefile
FFmpegSource2/Makefile FFmpegSource2/Makefile

View File

@ -5,16 +5,16 @@
} }
END { END {
print("#define static") > RES_CPP print("#define static") > RESRC_CPP
for (v in image) { for (v in image) {
printf("#include \"../bitmaps/%s_xpm.xpm\"\n", image[v]) >> RES_CPP printf("#include \"../bitmaps/%s_xpm.xpm\"\n", image[v]) >> RESRC_CPP
} }
print("#ifndef _RES_H") > RES_H print("#ifndef _RES_H") > RESRC_H
print("define _RES_H") >> RES_H print("#define _RES_H") >> RESRC_H
for (v in image) { for (v in image) {
printf("extern char *%s_xpm[];\n", image[v]) >> RES_H printf("extern char *%s_xpm[];\n", image[v]) >> RESRC_H
} }
print("#endif /* _RES_H */") >> RES_H print("#endif /* _RES_H */") >> RESRC_H
} }