ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug with dumping custom_4coder.so into the code path

This commit is contained in:
Allen Webster 2017-06-29 20:02:36 -04:00
parent e4aa2daa56
commit 0486657364
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.bat
View File

@ -17,5 +17,3 @@ popd
..\build\build ..\build\build
if %ERRORLEVEL% neq 0 (set FirstError=1) if %ERRORLEVEL% neq 0 (set FirstError=1)
:END

15
buildsuper.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# Store the real CWD
REAL_PWD="$PWD"
# Find the code home folder # Find the code home folder
TARGET_FILE="$0" TARGET_FILE="$0"
cd `dirname $TARGET_FILE` cd `dirname $TARGET_FILE`
@ -32,19 +35,9 @@ done
PHYS_DIR=`pwd -P` PHYS_DIR=`pwd -P`
SOURCE=$PHYS_DIR/$TARGET_FILE SOURCE=$PHYS_DIR/$TARGET_FILE
# Detect the OS and choose appropriate flags
chmod 777 "$CODE_HOME/detect_os.sh"
os=$("$CODE_HOME/detect_os.sh")
echo "Building on $os"
if [[ "$os" == "linux" ]]; then
FLAGS="-Wno-write-strings"
elif [[ "$os" == "mac" ]]; then
FLAGS="-Wno-null-dereference -Wno-comment -Wno-switch -Wno-writable-strings"
fi
FLAGS="-Wno-write-strings -Wno-null-dereference -Wno-comment -Wno-switch -Wno-writable-strings" FLAGS="-Wno-write-strings -Wno-null-dereference -Wno-comment -Wno-switch -Wno-writable-strings"
cd "$REAL_PWD"
echo "Building custom_4coders.so from $SOURCE" echo "Building custom_4coders.so from $SOURCE"
g++ -I"$CODE_HOME" $FLAGS -std=gnu++0x "$SOURCE" -shared -o custom_4coder.so -fPIC g++ -I"$CODE_HOME" $FLAGS -std=gnu++0x "$SOURCE" -shared -o custom_4coder.so -fPIC

1
meta/build.cpp
View File

@ -385,6 +385,7 @@ buildsuper(char *code_path, char *out_path, char *filename, b32 x86_build){
} }
#elif defined(IS_GCC) #elif defined(IS_GCC)
{ {
fprintf(stdout, "out_path: %s\n", out_path);
systemf("\"%s/buildsuper.sh\" \"%s\"", code_path, filename); systemf("\"%s/buildsuper.sh\" \"%s\"", code_path, filename);
} }
#else #else