-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28 from raysan5/develop
Integrating Develop branch
- Loading branch information
Showing
75 changed files
with
2,100 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ | |
* This example has been created using raylib 1.3 (www.raylib.com) | ||
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) | ||
* | ||
* Copyright (c) 2015 Ramon Santamaria (Ray San - [email protected]) | ||
* Copyright (c) 2015 Ramon Santamaria (@raysan5) | ||
* | ||
********************************************************************************************/ | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,10 +2,12 @@ | |
* | ||
* raylib [core] example - Windows drop files | ||
* | ||
* This example only works on platforms that support drag & drop (Windows, Linux, OSX, Html5?) | ||
* | ||
* This example has been created using raylib 1.3 (www.raylib.com) | ||
* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) | ||
* | ||
* Copyright (c) 2014 Ramon Santamaria (Ray San - [email protected]) | ||
* Copyright (c) 2015 Ramon Santamaria (@raysan5) | ||
* | ||
********************************************************************************************/ | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
# | ||
# raylib makefile for desktop platforms, Raspberry Pi and HTML5 (emscripten) | ||
# | ||
# Copyright (c) 2014 Ramon Santamaria (Ray San - [email protected]) | ||
# Copyright (c) 2015 Ramon Santamaria (@raysan5) | ||
# | ||
# This software is provided "as-is", without any express or implied warranty. In no event | ||
# will the authors be held liable for any damages arising from the use of this software. | ||
|
@@ -154,9 +154,14 @@ EXAMPLES = \ | |
core_input_keys \ | ||
core_input_mouse \ | ||
core_mouse_wheel \ | ||
core_input_gamepad \ | ||
core_random_values \ | ||
core_color_select \ | ||
core_drop_files \ | ||
core_3d_mode \ | ||
core_3d_picking \ | ||
core_3d_camera_free \ | ||
core_3d_camera_first_person \ | ||
shapes_logo_raylib \ | ||
shapes_basic_shapes \ | ||
shapes_colors_palette \ | ||
|
@@ -165,16 +170,24 @@ EXAMPLES = \ | |
textures_image_loading \ | ||
textures_rectangle \ | ||
textures_srcrec_dstrec \ | ||
textures_to_image \ | ||
textures_raw_data \ | ||
textures_formats_loading \ | ||
textures_particles_trail_blending \ | ||
text_sprite_fonts \ | ||
text_rbmf_fonts \ | ||
text_format_text \ | ||
text_font_select \ | ||
models_geometric_shapes \ | ||
models_planes \ | ||
models_box_collisions \ | ||
models_billboard \ | ||
models_obj_loading \ | ||
models_heightmap \ | ||
models_cubicmap \ | ||
shaders_model_shader \ | ||
shaders_shapes_textures \ | ||
shaders_custom_uniform \ | ||
shaders_postprocessing \ | ||
audio_sound_loading \ | ||
audio_music_stream \ | ||
fix_dylib \ | ||
|
@@ -201,16 +214,26 @@ core_input_keys: core_input_keys.c | |
core_input_mouse: core_input_mouse.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
ifeq ($(PLATFORM),PLATFORM_DESKTOP) | ||
# compile [core] example - gamepad input | ||
core_input_gamepad: core_input_gamepad.c | ||
ifeq ($(PLATFORM),PLATFORM_DESKTOP) | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
else | ||
@echo core_input_gamepad: Only supported on desktop platform | ||
endif | ||
|
||
# compile [core] example - mouse wheel | ||
core_mouse_wheel: core_mouse_wheel.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [core] example - drop files | ||
core_drop_files: core_drop_files.c | ||
ifeq ($(PLATFORM),PLATFORM_DESKTOP) | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
else | ||
@echo core_drop_files: Only supported on desktop platform | ||
endif | ||
|
||
# compile [core] example - generate random values | ||
core_random_values: core_random_values.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
@@ -223,6 +246,18 @@ core_color_select: core_color_select.c | |
core_3d_mode: core_3d_mode.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [core] example - 3d picking | ||
core_3d_picking: core_3d_picking.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [core] example - 3d camera free | ||
core_3d_camera_free: core_3d_camera_free.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [core] example - 3d camera first person | ||
core_3d_camera_first_person: core_3d_camera_first_person.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [shapes] example - raylib logo (with basic shapes) | ||
shapes_logo_raylib: shapes_logo_raylib.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
@@ -255,6 +290,22 @@ textures_rectangle: textures_rectangle.c | |
textures_srcrec_dstrec: textures_srcrec_dstrec.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [textures] example - texture to image | ||
textures_to_image: textures_to_image.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [textures] example - texture raw data | ||
textures_raw_data: textures_raw_data.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [textures] example - texture formats loading | ||
textures_formats_loading: textures_formats_loading.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [textures] example - texture particles trail blending | ||
textures_particles_trail_blending: textures_particles_trail_blending.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [text] example - sprite fonts loading | ||
text_sprite_fonts: text_sprite_fonts.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
@@ -275,6 +326,10 @@ text_font_select: text_font_select.c | |
models_geometric_shapes: models_geometric_shapes.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [models] example - box collisions | ||
models_box_collisions: models_box_collisions.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [models] example - basic window | ||
models_planes: models_planes.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
@@ -295,6 +350,22 @@ models_heightmap: models_heightmap.c | |
models_cubicmap: models_cubicmap.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [shaders] example - model shader | ||
shaders_model_shader: shaders_model_shader.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [shaders] example - shapes texture shader | ||
shaders_shapes_textures: shaders_shapes_textures.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [shaders] example - custom uniform in shader | ||
shaders_custom_uniform: shaders_custom_uniform.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [shaders] example - postprocessing shader | ||
shaders_postprocessing: shaders_postprocessing.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
||
# compile [audio] example - sound loading and playing (WAV and OGG) | ||
audio_sound_loading: audio_sound_loading.c | ||
$(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDES) $(LFLAGS) $(LIBS) -D$(PLATFORM) $(WINFLAGS) | ||
|
Oops, something went wrong.