diff options
| author | raysan5 <raysan5@gmail.com> | 2015-08-27 16:32:06 +0200 |
|---|---|---|
| committer | raysan5 <raysan5@gmail.com> | 2015-08-27 16:32:06 +0200 |
| commit | 3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863 (patch) | |
| tree | 9e2593de39f6daab0dc283837e325937cbf41f1c /examples/makefile | |
| parent | 8b3a82688e82922819d24494c08e24570c03bdc4 (diff) | |
| parent | 997170a317bb8077cb96d3fc757c6cde0c0ea466 (diff) | |
| download | raylib-3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863.tar.gz raylib-3a9ed0e8462570e30d92e2aa8c0ff3cf655ef863.zip | |
Merged master fixed conflict.
Diffstat (limited to 'examples/makefile')
| -rw-r--r-- | examples/makefile | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/examples/makefile b/examples/makefile index 9b0c9d4c..f351fbad 100644 --- a/examples/makefile +++ b/examples/makefile @@ -164,8 +164,6 @@ EXAMPLES = \ textures_logo_raylib \ textures_image_loading \ textures_rectangle \ - textures_compressed_dds \ - textures_mipmaps \ textures_srcrec_dstrec \ text_sprite_fonts \ text_rbmf_fonts \ @@ -253,14 +251,6 @@ textures_image_loading: textures_image_loading.c textures_rectangle: textures_rectangle.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) -# compile [textures] example - compressed texture loading (DDS) -textures_compressed_dds: textures_compressed_dds.c - $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) - -# compile [textures] example - texture mipmaps generation -textures_mipmaps: textures_mipmaps.c - $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) - # compile [textures] example - texture source and destination rectangles textures_srcrec_dstrec: textures_srcrec_dstrec.c $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) |