diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index d2871691..00000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 1f095691..104964db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vc120.pdb -4ed_data.ctm \ No newline at end of file +4ed_data.ctm +.DS_Store \ No newline at end of file diff --git a/build_string.bat b/build_string.bat index ec550bbf..23ee197d 100644 --- a/build_string.bat +++ b/build_string.bat @@ -1,21 +1,3 @@ @echo off build.bat /DSTRING_BUILD - -REM SET OPTS=-W4 -wd4310 -wd4100 -wd4201 -wd4505 -wd4996 -wd4127 -wd4510 -wd4512 -wd4610 -wd4390 -WX -REM SET OPTS=%OPTS% -wd4611 -GR- -EHa- -nologo -FC -REM -REM SET FirstError=0 -REM -REM pushd ..\build -REM cl %OPTS% ..\code\string\4ed_string_builder.cpp /Zi /Festring_builder -REM if %ERRORLEVEL% neq 0 (set FirstError=1) -REM if %ERRORLEVEL% neq 0 (goto END) -REM popd -REM -REM pushd string -REM ..\..\build\string_builder -REM if %ERRORLEVEL% neq 0 (set FirstError=1) -REM popd -REM -REM :END diff --git a/build_string.sh b/build_string.sh index 2832e70c..7a9fd107 100755 --- a/build_string.sh +++ b/build_string.sh @@ -1,11 +1,5 @@ #!/bin/bash -WARNINGS="-Wno-write-strings -Wno-comment -Wno-logical-op-parentheses -Wno-null-dereference -Wno-switch" -FLAGS="-D_GNU_SOURCE -fPIC -fpermissive" - -g++ $WARNINGS $FLAGS ../code/string/4ed_string_builder.cpp -g -o ../build/string_builder - -pushd string -../../build/string_builder -popd +chmod 777 build.sh +./build.sh "-DSTRING_BUILD" diff --git a/meta/.DS_Store b/meta/.DS_Store deleted file mode 100644 index 05640d8b..00000000 Binary files a/meta/.DS_Store and /dev/null differ diff --git a/package.sh b/package.sh index ca2ce96e..cd5f161f 100755 --- a/package.sh +++ b/package.sh @@ -1,7 +1,4 @@ #!/bin/bash -WARNINGS="-Wno-write-strings" -FLAGS="-D_GNU_SOURCE -fPIC -fpermissive -DPACKAGE" - -g++ $WARNINGS $FLAGS meta/build.cpp -g -o ../build/build -../build/build +chmod 777 build.sh +./build.sh "-DPACKAGE" diff --git a/site/.DS_Store b/site/.DS_Store deleted file mode 100644 index d8dfa096..00000000 Binary files a/site/.DS_Store and /dev/null differ diff --git a/string/.DS_Store b/string/.DS_Store deleted file mode 100644 index a499b661..00000000 Binary files a/string/.DS_Store and /dev/null differ diff --git a/string/4coder_string_build_num.txt b/string/4coder_string_build_num.txt index 33a9a573..0809364e 100644 --- a/string/4coder_string_build_num.txt +++ b/string/4coder_string_build_num.txt @@ -1,5 +1,5 @@ 1 0 -92 +93 diff --git a/string/build.bat b/string/build.bat deleted file mode 100644 index d4299d9d..00000000 --- a/string/build.bat +++ /dev/null @@ -1,19 +0,0 @@ -@echo off - -SET OPTS=-W4 -wd4310 -wd4100 -wd4201 -wd4505 -wd4996 -wd4127 -wd4510 -wd4512 -wd4610 -wd4390 -WX -SET OPTS=%OPTS% -wd4611 -GR- -EHa- -nologo -FC - -SET FirstError=0 - -pushd ..\build -cl %OPTS% ..\code\string\4ed_string_builder.cpp /Zi /Festring_builder -if %ERRORLEVEL% neq 0 (set FirstError=1) -if %ERRORLEVEL% neq 0 (goto END) -popd - -pushd string -..\..\build\string_builder -if %ERRORLEVEL% neq 0 (set FirstError=1) -popd - -:END