Merge pull request #564 from pbdot/ec-mac-fixes

A few Mac fixes for local development

.github/workflows/cmake.yml

@@ -102,8 +102,6 @@ jobs:
     - name: Install dependencies
       run: |
         brew install sdl2
-        cp ${{github.workspace}}/cmake/i_sdlinc_macos_ci.h ${{github.workspace}}/source_files/edge/i_sdlinc.h
-        cp ${{github.workspace}}/cmake/epi_sdl_macos_ci.h ${{github.workspace}}/source_files/epi/epi_sdl.h
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

.vscode/launch.json

@@ -13,7 +13,7 @@
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": []
-        },         
+        },
         {
             "name": "(gdb) Launch",
             "type": "cppdbg",
@@ -37,6 +37,18 @@
                     "ignoreFailures": true
                 }
             ]
-        }
-   ]
+        },
+        {
+            "name": "(lldb) Launch",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/edge-classic",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "lldb"
+        },
+    ]
 }

CMakeLists.txt

@@ -84,16 +84,21 @@ if (WIN32)
   set(SDL2_DIR "${CMAKE_SOURCE_DIR}/source_files/sdl2")
 endif()
 
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" AND APPLE)
-	add_compile_definitions(APPLE_SILICON)
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND APPLE)
-	add_compile_definitions(NOT_APPLE_SILICON)
+find_package(SDL2 REQUIRED)
+
+if (APPLE)
+  include_directories(${SDL2_INCLUDE_DIR})  
+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" AND APPLE)
+    add_compile_definitions(APPLE_SILICON)
+  elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND APPLE)
+    add_compile_definitions(NOT_APPLE_SILICON)
+  endif()
 endif()
-if(APPLE OR ${CMAKE_SYSTEM} MATCHES "BSD")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I /usr/local/include")
+
+if(${CMAKE_SYSTEM} MATCHES "BSD")
+  include_directories("/usr/local/include")  
 endif()
 
-find_package(SDL2 REQUIRED)
 if (NOT EDGE_GL_ES2)
   find_package(OpenGL REQUIRED)
 else()