Skip to content

Commit

Permalink
update Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
ColleagueRiley committed Mar 6, 2024
1 parent 7c19646 commit 39d1e72
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# This is free and unencumbered software released into the public domain.
# Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.

CC = gcc
AR = ar

LIBS := -lopengl32 -lshell32 -lgdi32
LIBS := -lopengl32 -lshell32 -lgdi32 -lXInput -lShcore
EXT = dll

ifneq (,$(filter $(CC),winegcc x86_64-w64-mingw32-gcc))
Expand All @@ -27,7 +30,7 @@ else
endif

ifeq ($(detected_OS),Windows)
LIBS := -lopengl32 -lshell32 -lgdi32
LIBS := -lopengl32 -lshell32 -lgdi32 -lXInput -lShcore
EXT = dll
endif
ifeq ($(detected_OS),Darwin) # Mac OS X
Expand Down
4 changes: 2 additions & 2 deletions examples/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

CC = gcc

LIBS := -I.. -lopengl32 -lshell32 -lgdi32 -lm
LIBS := -I.. -lopengl32 -lshell32 -lgdi32 -lm -lXInput -lShcore
ifneq (,$(filter $(CC),winegcc x86_64-w64-mingw32-gcc))
detected_OS := Windows
else
Expand All @@ -18,7 +18,7 @@ endif
endif

ifeq ($(detected_OS),Windows)
LIBS := -I.. -lopengl32 -lshell32 -lgdi32 -lm
LIBS := -I.. -lopengl32 -lXInput -lShcore -lshell32 -lgdi32 -lm
endif
ifeq ($(detected_OS),Darwin) # Mac OS X
LIBS := -I.. -lm -framework Foundation -framework AppKit -framework OpenGL -framework CoreVideo
Expand Down

0 comments on commit 39d1e72

Please sign in to comment.