Explorar o código

Fix makefile for Mac OSX & Add better gitignore

Jordy Sipkema %!s(int64=9) %!d(string=hai) anos
pai
achega
084db28abf
Modificáronse 3 ficheiros con 35 adicións e 2 borrados
  1. 33 0
      .gitignore
  2. 1 1
      CMakeLists.txt
  3. 1 1
      make.sh

+ 33 - 0
.gitignore

@@ -1,3 +1,36 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+# File-based project format:
+*.iws
+
+
+# End of JetBrains IDE ignore
+
+
+# Start of C-files ignore
+
 # Object files
 *.o
 *.ko

+ 1 - 1
CMakeLists.txt

@@ -5,7 +5,7 @@ project(mutli_os_build)
 IF(${WIN32})
 	add_custom_target(multi_os_build COMMAND make -C ${mutli_os_build_SOURCE_DIR})
 ELSEIF(${APPLE})
-	add_custom_target(multi_os_build cd ${mutli_os_build_SOURCE_DIR} && bash make.sh /dev/cu.usbserial)
+	add_custom_target(multi_os_build cd ${mutli_os_build_SOURCE_DIR} && bash make.sh /dev/tty.SLAB_USBtoUART)
 ELSEIF(${UNIX})
 	add_custom_target(mutli_os_build cd ${mutli_os_build_SOURCE_DIR} && bash make.sh /dev/ttyUSB0)
 ENDIF()

+ 1 - 1
make.sh

@@ -2,7 +2,7 @@
 if [ "$1" == "" ]; then
 	echo "Only building, not flashing. Add a tty port for flashing."
 else
-	port="/dev/ttyUSB0";
+	port="$1";
 fi