Flex 1.2.0 release

1 files changed, 13 insertions, 11 deletions

diff --git a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
index f37fc83..5737c66 100644
--- a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
+++ b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
@@ -3,9 +3,7 @@
 ProjectName = flexDemoCUDA
 flexDemoCUDA_cppfiles   += ./../../imgui.cpp
 flexDemoCUDA_cppfiles   += ./../../main.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/imguiRenderGL.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/shader.cpp
-flexDemoCUDA_cppfiles   += ./../../opengl/shadersGL.cpp
+flexDemoCUDA_cppfiles   += ./../../shadersDemoContext.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/aabbtree.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/core.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/extrude.cpp
@@ -14,9 +12,13 @@ flexDemoCUDA_cppfiles   += ./../../../core/mesh.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/perlin.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/pfm.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/platform.cpp
+flexDemoCUDA_cppfiles   += ./../../../core/png.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/sdf.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/tga.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/voxelize.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/imguiRenderGL.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/shader.cpp
+flexDemoCUDA_cppfiles   += ./../../opengl/shadersGL.cpp
 
 flexDemoCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDemoCUDA_ccfiles)))))
@@ -29,11 +31,11 @@ flexDemoCUDA_c_debug_dep      = $(addprefix $(DEPSDIR)/flexDemoCUDA/debug/, $(su
 flexDemoCUDA_debug_dep      = $(flexDemoCUDA_cpp_debug_dep) $(flexDemoCUDA_cc_debug_dep) $(flexDemoCUDA_c_debug_dep)
 -include $(flexDemoCUDA_debug_dep)
 flexDemoCUDA_release_hpaths    := 
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/include
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexDemoCUDA_release_hpaths    += /usr/local/cuda/include
+flexDemoCUDA_release_hpaths    += /usr/local/cuda/extras/cupti/include
 flexDemoCUDA_release_hpaths    += ./../../..
 flexDemoCUDA_release_lpaths    := 
-flexDemoCUDA_release_lpaths    += $(CUDA_PATH)/lib64
+flexDemoCUDA_release_lpaths    += /usr/local/cuda/lib64
 flexDemoCUDA_release_lpaths    += ./../../../lib/linux64
 flexDemoCUDA_release_defines   := $(flexDemoCUDA_custom_defines)
 flexDemoCUDA_release_libraries := 
@@ -54,7 +56,7 @@ flexDemoCUDA_release_cppflags	:= $(flexDemoCUDA_release_common_cflags)
 flexDemoCUDA_release_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_release_lflags    += $(addprefix -L, $(flexDemoCUDA_release_lpaths))
 flexDemoCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_release_libraries)) -Wl,--end-group
-flexDemoCUDA_release_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
+flexDemoCUDA_release_lflags  += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_release_lflags  += -m64
 flexDemoCUDA_release_objsdir  = $(OBJS_DIR)/flexDemoCUDA_release
 flexDemoCUDA_release_cpp_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
@@ -111,11 +113,11 @@ $(flexDemoCUDA_release_c_o): $(flexDemoCUDA_release_objsdir)/%.o:
 	  rm -f $(flexDemoCUDA_release_DEPDIR).d
 
 flexDemoCUDA_debug_hpaths    := 
-flexDemoCUDA_debug_hpaths    += $(CUDA_PATH)/include
-flexDemoCUDA_debug_hpaths    += $(CUDA_PATH)/extras/cupti/include
+flexDemoCUDA_debug_hpaths    += /usr/local/cuda/include
+flexDemoCUDA_debug_hpaths    += /usr/local/cuda/extras/cupti/include
 flexDemoCUDA_debug_hpaths    += ./../../..
 flexDemoCUDA_debug_lpaths    := 
-flexDemoCUDA_debug_lpaths    += $(CUDA_PATH)/lib64
+flexDemoCUDA_debug_lpaths    += /usr/local/cuda/lib64
 flexDemoCUDA_debug_lpaths    += ./../../../lib/linux64
 flexDemoCUDA_debug_defines   := $(flexDemoCUDA_custom_defines)
 flexDemoCUDA_debug_libraries := 
@@ -136,7 +138,7 @@ flexDemoCUDA_debug_cppflags	:= $(flexDemoCUDA_debug_common_cflags)
 flexDemoCUDA_debug_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_debug_lflags    += $(addprefix -L, $(flexDemoCUDA_debug_lpaths))
 flexDemoCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_debug_libraries)) -Wl,--end-group
-flexDemoCUDA_debug_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
+flexDemoCUDA_debug_lflags  += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_debug_lflags  += -m64
 flexDemoCUDA_debug_objsdir  = $(OBJS_DIR)/flexDemoCUDA_debug
 flexDemoCUDA_debug_cpp_o    = $(addprefix $(flexDemoCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))