mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
More repo cleanup.
This commit is contained in:
+3
-42
@@ -1,45 +1,6 @@
|
||||
build
|
||||
bak
|
||||
doc
|
||||
db
|
||||
.deps
|
||||
.dirstamp
|
||||
config.log
|
||||
config.status
|
||||
autom4te.cache
|
||||
aclocal.m4
|
||||
Makefile
|
||||
core
|
||||
stamp-h1
|
||||
config.h
|
||||
doxygen
|
||||
warnings.log
|
||||
docwarnings.log
|
||||
packages
|
||||
/autom4te.cache
|
||||
/aclocal.m4
|
||||
|
||||
/data
|
||||
/*.dll
|
||||
/magicseteditor
|
||||
/magicseteditor.*
|
||||
|
||||
/old
|
||||
/test-files
|
||||
|
||||
*.bak
|
||||
*.o
|
||||
*.i
|
||||
*.ncb
|
||||
*.pch
|
||||
*.user
|
||||
|
||||
stamp-h1
|
||||
warnings.log
|
||||
*.suo
|
||||
*.old
|
||||
*.err
|
||||
*.out
|
||||
dummy-magic-set.mse-set
|
||||
|
||||
_dummy*
|
||||
cards-out
|
||||
/build_*
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ echo '
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
bin_PROGRAMS = magicseteditor
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I$(top_srcdir)/src -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS)
|
||||
|
||||
.hpp.gch:
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
bin_PROGRAMS = magicseteditor
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I$(top_srcdir)/src -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS)
|
||||
|
||||
.hpp.gch:
|
||||
|
||||
+1
-1
@@ -598,7 +598,7 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
# This flag allows us to use subdirectories:
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ $(BOOST_CXXFLAGS) -I$(top_srcdir)/src -I. -Wall -Wno-unused-local-typedefs
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS)
|
||||
magicseteditor_LDADD = @WX_LIBS@ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(LDADD) -lhunspell
|
||||
magicseteditor_CXXFLAGS = $(AM_CXXFLAGS) $(am__append_2)
|
||||
|
||||
Vendored
-2039
File diff suppressed because it is too large
Load Diff
+14
-6
@@ -3,29 +3,37 @@
|
||||
clean=0
|
||||
|
||||
build_win32() {
|
||||
./configure --enable-pch --target=i686-w64-mingw32 --with-wx-config=/usr/i686-w64-mingw32/lib/wx/config/i686-w64-mingw32-msw-unicode-release-static-2.8 \
|
||||
mkdir -p build_win32; pushd build_win32
|
||||
rm data resource
|
||||
ln -s ../data ../resource .
|
||||
|
||||
../configure --enable-pch --target=i686-w64-mingw32 --with-wx-config=/usr/i686-w64-mingw32/lib/wx/config/i686-w64-mingw32-msw-unicode-release-static-2.8 \
|
||||
--with-boost=/usr/i686-w64-mingw32/ CXX="i686-w64-mingw32-g++" LDFLAGS="-static" LDADD="-lgdiplus -llzma"
|
||||
if [ $clean = 1 ]; then
|
||||
make clean
|
||||
fi
|
||||
make -j4
|
||||
strip magicseteditor.exe
|
||||
i686-w64-mingw32-g++ -static -s -o magicseteditor.com src/cli/win32_cli_wrapper.cpp
|
||||
i686-w64-mingw32-g++ -static -s -o magicseteditor.com ../src/cli/win32_cli_wrapper.cpp
|
||||
|
||||
popd
|
||||
}
|
||||
build_linux() {
|
||||
./configure --target=i686- --with-wx-config=wx-config-2.8
|
||||
mkdir -p build_linux; pushd build_linux
|
||||
|
||||
../configure --with-wx-config=wx-config-2.8
|
||||
if [ $clean = 1 ]; then
|
||||
make clean
|
||||
fi
|
||||
make -j4
|
||||
strip magicseteditor
|
||||
|
||||
popd
|
||||
}
|
||||
build_dist() {
|
||||
upx -9 magicseteditor magicseteditor.com magicseteditor.exe
|
||||
echo ""
|
||||
}
|
||||
|
||||
rm magicseteditor magicseteditor.*
|
||||
|
||||
case $1 in
|
||||
win32)
|
||||
build_win32
|
||||
|
||||
Reference in New Issue
Block a user