Changeset fccd588 in network-game

Timestamp:

Jan 8, 2019, 9:43:52 PM (6 years ago)

Author:

dportnoy15 <dmitry.portnoy@…>

Branches:

master

Children:

ea3a3a9

Parents:

8cbeffc

Message:

Make the graphics library project compile successfully on a Mac

Location:

graphics_library

Files:

• TextureFragmentShader.fragmentshader (modified) (1 diff)
• main.cpp (modified) (1 diff)
• makefile (modified) (1 diff)

graphics_library/TextureFragmentShader.fragmentshader

@@ -13 +13 @@
 
         // Output color = color of the texture at the specified UV
-        color = texture2D( myTextureSampler, UV ).rgb;
+        color = texture( myTextureSampler, UV ).rgb;
 }

graphics_library/main.cpp

@@ -19 +19 @@
 #include "common/controls.hpp"
 
-int main( void )
-{
+int main( void ) {
         // Initialise GLFW
-        if( !glfwInit() )
-        {
+        if( !glfwInit() ) {
                 fprintf( stderr, "Failed to initialize GLFW\n" );
                 return -1;
         }
 
-        glfwWindowHint(GLFW_SAMPLES, 4);
-        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-        glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+        #ifdef __APPLE__
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+            glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
+            glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+        #else
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+        #endif
 
         // Open a window and create its OpenGL context

graphics_library/makefile

@@ +1 @@
+OS = $(shell uname)
 CC = g++
-LIB_FLAGS = -lGL -lglut -lGLEW `pkg-config glfw3 --static --cflags --libs`
 FLAGS = -Wall
 DEPENDENCIES = common/texture.o common/controls.o common/shader.o
+
+ifeq ($(OS),Darwin)
+        LIB_FLAGS = -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -lglfw3 -lglew
+endif
+ifeq ($(OS),Linux)
+        LIB_FLAGS = -lGL -lglut -lGLEW `pkg-config glfw3 --static --cflags --libs`
+endif
 
 graphics_engine : main.cpp $(DEPENDENCIES)