aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorGravatar Chris Xiong <chirs241097@gmail.com> 2018-02-12 23:39:19 +0800
committerGravatar Chris Xiong <chirs241097@gmail.com> 2018-02-12 23:39:19 +0800
commit7621516c1ca0ecf9f80d094763a1705c32d7458f (patch)
treee8cd9cd39107114354ea03d268468aac36837710 /examples
parent7a0afbb0ee9ead422307a36d90e60702d7dbc5fb (diff)
downloadSMELT-7621516c1ca0ecf9f80d094763a1705c32d7458f.tar.xz
Now we have unified the GLFW versions (uglily).
Also fixed a symbol conflict for the good old msvc.
Diffstat (limited to 'examples')
-rw-r--r--examples/makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/examples/makefile b/examples/makefile
index d25e638..c927ae7 100644
--- a/examples/makefile
+++ b/examples/makefile
@@ -4,9 +4,8 @@ LINK= -lSDL2 -lvorbis -lvorbisfile -lopenal -ljpeg -lpng -lfreetype -lz -lsmelte
LINK_GLFW= -lglfw -lGLEW -lGL -lvorbis -lvorbisfile -lopenal -ljpeg -lpng -lfreetype -lz -lsmeltext -lsmelt -lCxImage
LINK_FOLDER= -L../smelt/sdl -L../extensions
LINK_GLFW_FOLDER= -L../smelt/glfw -L../extensions
-LINK_GLFW_M_FOLDER= -L../smelt/glfw_m -L../extensions
-all: sdl glfw glfw_m
+all: sdl glfw
sdl:
$(CC) smelt_test.cpp $(CXXFLAGS) $(LINK_FOLDER) $(LINK) -o smelt_test
@@ -14,5 +13,3 @@ clean:
rm smelt_test
glfw:
$(CC) smelt_test.cpp $(CXXFLAGS) $(LINK_GLFW_FOLDER) $(LINK_GLFW) -o smelt_test_glfw
-glfw_m:
- $(CC) smelt_test.cpp $(CXXFLAGS) $(LINK_GLFW_M_FOLDER) $(LINK_GLFW) -o smelt_test_glfw_m