about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCharadon <dev@iotib.net>2022-06-16 22:36:30 -0400
committerCharadon <dev@iotib.net>2022-06-16 22:36:30 -0400
commit3d0915d1265280ecb070da15cd7a31e9a0b16e7c (patch)
tree18cd58ec17a0112106aa5b5123baaf49801b6f88
parent2a9a5727d6b2ab63e1714b9a4721e771581eec8f (diff)
downloadPong-C-3d0915d1265280ecb070da15cd7a31e9a0b16e7c.tar.gz
I, uh, did it wrong lol
-rw-r--r--Pong.make6
-rw-r--r--premake5.lua18
2 files changed, 12 insertions, 12 deletions
diff --git a/Pong.make b/Pong.make
index d5501b5..1257627 100644
--- a/Pong.make
+++ b/Pong.make
@@ -26,12 +26,12 @@ DEFINES +=
 INCLUDES +=
 FORCE_INCLUDE +=
 ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
-ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Og -g -ggdb `pkgconf --cflags raylib` `pkgconf --cflags glfw3` `pkgconf --cflags gl` `pkgconf --cflags sdl2` `pkgconf --cflags SDL2_mixer` `pkgconf --cflags glu`
-ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Og -g -ggdb `pkgconf --cflags raylib` `pkgconf --cflags glfw3` `pkgconf --cflags gl` `pkgconf --cflags sdl2` `pkgconf --cflags SDL2_mixer` `pkgconf --cflags glu`
+ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -Og -g -ggdb `pkg-config --cflags raylib` `pkg-config --cflags glfw3` `pkg-config --cflags gl` `pkg-config --cflags sdl2` `pkg-config --cflags SDL2_mixer` `pkg-config --cflags glu`
+ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -Og -g -ggdb `pkg-config --cflags raylib` `pkg-config --cflags glfw3` `pkg-config --cflags gl` `pkg-config --cflags sdl2` `pkg-config --cflags SDL2_mixer` `pkg-config --cflags glu`
 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
 LIBS +=
 LDDEPS +=
-ALL_LDFLAGS += $(LDFLAGS) -s -g -ggdb `pkgconf --libs raylib` `pkgconf --libs glfw3` `pkgconf --libs gl` `pkgconf --libs sdl2` `pkgconf --libs SDL2_mixer` `pkgconf --libs glu`
+ALL_LDFLAGS += $(LDFLAGS) -s -g -ggdb `pkg-config --libs raylib` `pkg-config --libs glfw3` `pkg-config --libs gl` `pkg-config --libs sdl2` `pkg-config --libs SDL2_mixer` `pkg-config --libs glu`
 LINKCMD = $(CC) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
 define PREBUILDCMDS
 endef
diff --git a/premake5.lua b/premake5.lua
index b327395..7b8f642 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -42,47 +42,47 @@ project("Pong")
             AllGood = true
             if(Pkgconf_Result == nil)
             then
-                print("You do not have pkgconf installed. Aborting.")
+                print("You do not have pkg-config installed. Aborting.")
                 os.exit(1)
             end
             io.write("Raylib: ")
             io.flush()
-            if(os.executef("pkgconf --modversion raylib") == nil)
+            if(os.executef("pkg-config --modversion raylib") == nil)
             then
                 print("Can't find raylib.")
                 AllGood = false
             end
             io.write("SDL2: ")
             io.flush()
-            if(os.executef("pkgconf --modversion sdl2") == nil)
+            if(os.executef("pkg-config --modversion sdl2") == nil)
             then
                 print("Can't find SDL2.")
                 AllGood = false
             end
             io.write("SDL2_mixer: ")
             io.flush()
-            if (os.executef("pkgconf --modversion SDL2_mixer") == nil)
+            if (os.executef("pkg-config --modversion SDL2_mixer") == nil)
             then
                 print("Can't find SDL2_mixer.")
                 AllGood = false
             end
             io.write("GLFW3: ")
             io.flush()
-            if (os.executef("pkgconf --modversion glfw3") == nil)
+            if (os.executef("pkg-config --modversion glfw3") == nil)
             then
                 print("Can't find GLFW.")
                 AllGood = false
             end
 	    io.write("GL: ")
 	    io.flush()
-	    if (os.executef("pkgconf --modversion gl") == nil)
+	    if (os.executef("pkg-config --modversion gl") == nil)
 	    then
 		    print("Can't find OpenGL")
 		    AllGood = false
 	    end
 	    io.write("GLU: ")
 	    io.flush()
-	    if (os.executef("pkgconf --modversion glu") == nil)
+	    if (os.executef("pkg-config --modversion glu") == nil)
 	    then
 		    print("Can't find GLU")
 		    AllGood = false
@@ -122,7 +122,7 @@ project("Pong")
     if (flatpak == true)
     then
     else
-        buildoptions {"-g", "-ggdb", "`pkgconf --cflags raylib`", "`pkgconf --cflags glfw3`", "`pkgconf --cflags gl`", "`pkgconf --cflags sdl2`", "`pkgconf --cflags SDL2_mixer`", "`pkgconf --cflags glu`"}
-        linkoptions {"-g", "-ggdb", "`pkgconf --libs raylib`", "`pkgconf --libs glfw3`", "`pkgconf --libs gl`", "`pkgconf --libs sdl2`", "`pkgconf --libs SDL2_mixer`", "`pkgconf --libs glu`"}
+        buildoptions {"-g", "-ggdb", "`pkg-config --cflags raylib`", "`pkg-config --cflags glfw3`", "`pkg-config --cflags gl`", "`pkg-config --cflags sdl2`", "`pkg-config --cflags SDL2_mixer`", "`pkg-config --cflags glu`"}
+        linkoptions {"-g", "-ggdb", "`pkg-config --libs raylib`", "`pkg-config --libs glfw3`", "`pkg-config --libs gl`", "`pkg-config --libs sdl2`", "`pkg-config --libs SDL2_mixer`", "`pkg-config --libs glu`"}
     end