From c39759f83c9acc67c09edf7f56db63ef3458ca6e Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 28 Apr 2020 17:24:26 +0200 Subject: [PATCH] little fix to premakefile --- premake5.lua | 13 ++++++++----- tools/playground/Bm437_IBM_BIOS.FON | Bin 0 -> 4064 bytes .../{clumpview => playground}/Bm437_IBM_BIOS.tga | Bin tools/playground/Bm437_IBM_VGA8.FON | Bin 0 -> 6112 bytes .../{clumpview => playground}/Bm437_IBM_VGA8.tga | Bin tools/{clumpview => playground}/camera.cpp | 0 tools/{clumpview => playground}/camera.h | 0 tools/{clumpview => playground}/font.cpp | 0 tools/{clumpview => playground}/foobar.tga | Bin tools/{clumpview => playground}/main.cpp | 0 tools/{clumpview => playground}/maze.tga | Bin tools/{clumpview => playground}/ras_test.cpp | 0 tools/{clumpview => playground}/teapot.dff | Bin tools/{clumpview => playground}/tl_tests.cpp | 0 14 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 tools/playground/Bm437_IBM_BIOS.FON rename tools/{clumpview => playground}/Bm437_IBM_BIOS.tga (100%) create mode 100644 tools/playground/Bm437_IBM_VGA8.FON rename tools/{clumpview => playground}/Bm437_IBM_VGA8.tga (100%) rename tools/{clumpview => playground}/camera.cpp (100%) rename tools/{clumpview => playground}/camera.h (100%) rename tools/{clumpview => playground}/font.cpp (100%) rename tools/{clumpview => playground}/foobar.tga (100%) rename tools/{clumpview => playground}/main.cpp (100%) rename tools/{clumpview => playground}/maze.tga (100%) rename tools/{clumpview => playground}/ras_test.cpp (100%) rename tools/{clumpview => playground}/teapot.dff (100%) rename tools/{clumpview => playground}/tl_tests.cpp (100%) diff --git a/premake5.lua b/premake5.lua index f44cdf9..abb0686 100644 --- a/premake5.lua +++ b/premake5.lua @@ -17,7 +17,7 @@ newoption { } newoption { - trigger = "glfwdir", + trigger = "glfwdir64", value = "PATH", description = "Directory of glfw", default = "../glfw-3.3.2.bin.WIN64", @@ -94,8 +94,11 @@ workspace "librw" filter { "platforms:win*gl3" } defines { "GLEW_STATIC" } includedirs { path.join(_OPTIONS["glewdir"], "include") } - includedirs { path.join(_OPTIONS["glfwdir"], "include") } includedirs { path.join(_OPTIONS["sdl2dir"], "include") } + filter { "platforms:win-x86-gl3" } + includedirs { path.join(_OPTIONS["glfwdir32"], "include") } + filter { "platforms:win-amd64-gl3" } + includedirs { path.join(_OPTIONS["glfwdir64"], "include") } filter "action:vs*" buildoptions { "/wd4996", "/wd4244" } @@ -141,7 +144,7 @@ function findlibs() links { "glew32" } filter { "platforms:win-amd64-gl3" } libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") } - libdirs { path.join(_OPTIONS["glfwdir"], "lib-vc2015") } + libdirs { path.join(_OPTIONS["glfwdir64"], "lib-vc2015") } libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x64") } filter { "platforms:win-x86-gl3" } libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") } @@ -192,10 +195,10 @@ function vucode() filter {} end -project "clumpview" +project "playground" kind "WindowedApp" characterset ("MBCS") - skeltool("clumpview") + skeltool("playground") flags { "WinMain" } removeplatforms { "*null" } removeplatforms { "ps2" } -- for now diff --git a/tools/playground/Bm437_IBM_BIOS.FON b/tools/playground/Bm437_IBM_BIOS.FON new file mode 100644 index 0000000000000000000000000000000000000000..be2443fac462676de6edbddd15395ccaffc88333 GIT binary patch literal 4064 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 TmuD7M{23klp@aWC=-T}s%WfVB literal 0 HcmV?d00001 diff --git a/tools/clumpview/Bm437_IBM_VGA8.tga b/tools/playground/Bm437_IBM_VGA8.tga similarity index 100% rename from tools/clumpview/Bm437_IBM_VGA8.tga rename to tools/playground/Bm437_IBM_VGA8.tga diff --git a/tools/clumpview/camera.cpp b/tools/playground/camera.cpp similarity index 100% rename from tools/clumpview/camera.cpp rename to tools/playground/camera.cpp diff --git a/tools/clumpview/camera.h b/tools/playground/camera.h similarity index 100% rename from tools/clumpview/camera.h rename to tools/playground/camera.h diff --git a/tools/clumpview/font.cpp b/tools/playground/font.cpp similarity index 100% rename from tools/clumpview/font.cpp rename to tools/playground/font.cpp diff --git a/tools/clumpview/foobar.tga b/tools/playground/foobar.tga similarity index 100% rename from tools/clumpview/foobar.tga rename to tools/playground/foobar.tga diff --git a/tools/clumpview/main.cpp b/tools/playground/main.cpp similarity index 100% rename from tools/clumpview/main.cpp rename to tools/playground/main.cpp diff --git a/tools/clumpview/maze.tga b/tools/playground/maze.tga similarity index 100% rename from tools/clumpview/maze.tga rename to tools/playground/maze.tga diff --git a/tools/clumpview/ras_test.cpp b/tools/playground/ras_test.cpp similarity index 100% rename from tools/clumpview/ras_test.cpp rename to tools/playground/ras_test.cpp diff --git a/tools/clumpview/teapot.dff b/tools/playground/teapot.dff similarity index 100% rename from tools/clumpview/teapot.dff rename to tools/playground/teapot.dff diff --git a/tools/clumpview/tl_tests.cpp b/tools/playground/tl_tests.cpp similarity index 100% rename from tools/clumpview/tl_tests.cpp rename to tools/playground/tl_tests.cpp