More CMakeList additions

Set up AppKit framework
This commit is contained in:
2017-11-05 21:27:09 -08:00
parent 7e38a4c311
commit ea1c447f1d
4 changed files with 27 additions and 2 deletions

View File

@@ -45,11 +45,13 @@ endmacro()
IF(APPLE) IF(APPLE)
# SET(GUI_TYPE MACOSX_BUNDLE) # SET(GUI_TYPE MACOSX_BUNDLE)
# INCLUDE_DIRECTORIES ( /Developer/Headers/FlatCarbon ) # INCLUDE_DIRECTORIES ( /Developer/Headers/FlatCarbon )
FIND_LIBRARY(APPKIT_LIBRARY AppKit)
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
FIND_LIBRARY(AUDIO_TOOLBOX_LIBRARY AudioToolbox) FIND_LIBRARY(AUDIO_TOOLBOX_LIBRARY AudioToolbox)
MARK_AS_ADVANCED (OPENGL_LIBRARY MARK_AS_ADVANCED (APPKIT_LIBRARY
OPENGL_LIBRARY
AUDIO_TOOLBOX_LIBRARY) AUDIO_TOOLBOX_LIBRARY)
SET(EXTRA_LIBS ${OPENGL_LIBRARY} ${AUDIO_TOOLBOX_LIBRARY}) SET(EXTRA_LIBS ${APPKIT_LIBRARY} ${OPENGL_LIBRARY} ${AUDIO_TOOLBOX_LIBRARY})
FIND_PATH(COCOA_INCLUDE_DIR OpenGL/gl3.h) FIND_PATH(COCOA_INCLUDE_DIR OpenGL/gl3.h)
ENDIF (APPLE) ENDIF (APPLE)

View File

@@ -22,4 +22,20 @@ add_sources(KRAnimationLayer.cpp)
add_sources(KRAnimationManager.cpp) add_sources(KRAnimationManager.cpp)
add_sources(KRAudioBuffer.cpp) add_sources(KRAudioBuffer.cpp)
add_sources(KRAudioManager.cpp) add_sources(KRAudioManager.cpp)
add_sources(KRAudioSample.cpp)
add_sources(KRAudioSource.cpp)
add_sources(KRBehavior.cpp)
add_sources(KRDataBlock.cpp) add_sources(KRDataBlock.cpp)
add_sources(KRBone.cpp)
add_sources(KRBundle.cpp)
add_sources(KRBundleManager.cpp)
add_sources(KRCamera.cpp)
add_sources(KRCollider.cpp)
add_sources(KRContext.cpp)
IF(APPLE)
IF(IOS)
add_sources(KRContext_ios.mm)
ELSE()
add_sources(KRContext_osx.mm)
ENDIF()
ENDIF (APPLE)

View File

@@ -1064,6 +1064,9 @@ std::string KRCamera::getDebugText()
case KRNode::RENDER_PASS_SHADOWMAP: case KRNode::RENDER_PASS_SHADOWMAP:
stream << "shadow"; stream << "shadow";
break; break;
default:
// Suppress warnings
break;
} }
stream << "\t" << (*itr).object_name << "\t" << (*itr).material_name; stream << "\t" << (*itr).object_name << "\t" << (*itr).material_name;
vertex_count += (*itr).vertex_count; vertex_count += (*itr).vertex_count;
@@ -1085,6 +1088,9 @@ std::string KRCamera::getDebugText()
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_SIREN_AMBIENT_ZONES: case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_SIREN_AMBIENT_ZONES:
stream << "Siren - Ambient Zones"; stream << "Siren - Ambient Zones";
break; break;
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_NUMBER:
// Suppress warning
break;
} }
return stream.str(); return stream.str();
} }

View File

@@ -7,6 +7,7 @@
// //
#include "KREngine-common.h" #include "KREngine-common.h"
#include <AppKit/AppKit.h>
#include "KRContext.h" #include "KRContext.h"