diff --git a/raylib.make b/raylib.make index 690992f..df81886 100644 --- a/raylib.make +++ b/raylib.make @@ -44,54 +44,54 @@ endef ifeq ($(config),debug_x64) TARGETDIR = bin/Debug -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/x64/Debug/raylib -DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 else ifeq ($(config),debug_x86) TARGETDIR = bin/Debug -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/x86/Debug/raylib -DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 else ifeq ($(config),debug_arm64) TARGETDIR = bin/Debug -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/ARM64/Debug/raylib -DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_x64) TARGETDIR = bin/Release -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/x64/Release/raylib -DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s else ifeq ($(config),release_x86) TARGETDIR = bin/Release -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/x86/Release/raylib -DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s else ifeq ($(config),release_arm64) TARGETDIR = bin/Release -TARGET = $(TARGETDIR)/raylib.lib +TARGET = $(TARGETDIR)/libraylib.a OBJDIR = obj/ARM64/Release/raylib -DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 +DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2 ALL_LDFLAGS += $(LDFLAGS) -s @@ -159,7 +159,7 @@ ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -rf $(OBJDIR) else $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET)) - $(SILENT) $(foreach f,$(subst /,\\,$(GENERATED)),if exist $(f) del /s /q $(f) >nul &) + $(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED)) $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR)) endif diff --git a/resources/mrsh.png b/resources/mrsh.png new file mode 100644 index 0000000..9186835 Binary files /dev/null and b/resources/mrsh.png differ diff --git a/src/main.c b/src/main.c index 00cd703..23d8db9 100644 --- a/src/main.c +++ b/src/main.c @@ -24,7 +24,7 @@ int main () SearchAndSetResourceDir("resources"); // Load a texture from the resources directory - Image image = LoadImage("emi.png"); + Image image = LoadImage("mrsh.png"); Texture2D emi = LoadTextureFromImage(image); UnloadImage(image); @@ -48,7 +48,9 @@ int main () // Setup the back buffer for drawing (clear color and depth buffers) ClearBackground(BLACK); - DrawRectangle(HorizontalPosition, VerticalPosition, 10, 10, BLUE); + // DrawRectangle(HorizontalPosition, VerticalPosition, 10, 10, BLUE); + DrawTexture(emi, HorizontalPosition, VerticalPosition, WHITE); + DrawCircle(positionXCollectible, positionYCollectible, 10, YELLOW);