Browse Source

Updated: Add extra debug in debug build. Fix dbuild.

Steve Thielemann 4 years ago
parent
commit
e445a6b909
2 changed files with 5 additions and 2 deletions
  1. 2 1
      CMakeLists.txt
  2. 3 1
      build_images.sh

+ 2 - 1
CMakeLists.txt

@@ -33,6 +33,7 @@ ENDIF(GIT_FOUND)
 
 ## https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_macros.html
 ## During Debug, use debug version of libstdc++ (asserts on access to invalid iterators, etc!)
+## set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -fsanitize=address -fsanitize=leak -fsanitize=undefined -fsanitize=shift-base -fsanitize=unreachable -fsanitize=null -fsanitize=return -fsanitize=bounds-strict -fsanitize=object-size")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 
@@ -167,7 +168,7 @@ file(GLOB IMAGES
 
 add_custom_command(
     OUTPUT images.h
-    COMMAND ./build_images.sh
+    COMMAND ./build_images.sh ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_SOURCE_DIR} 
     DEPENDS ansi-to-src ${IMAGES}
     COMMENT "Generating images.h"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

+ 3 - 1
build_images.sh

@@ -3,8 +3,10 @@
 BASE=.$$images.h
 FINAL=images.h
 
-export PATH=$PATH:build:.
+export PATH=$PATH:$1:.
+# export PATH=$PATH:build:.
 
+echo "Adding $1 to path"
 # echo $PATH
 
 ansi-to-src ansi/*.ans > $BASE