From 6003586494e68add73e85b55da9829030527a844 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 23 Jul 2017 16:01:45 -0400 Subject: [PATCH] improved makefile --- Makefile | 40 +++++++++++++++++----------------------- conf.lua | 2 +- conf.mobile.lua | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 conf.mobile.lua diff --git a/Makefile b/Makefile index 14f27ff..88b204a 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,34 @@ run: love - love dist/supersphere.love + love dist/supersphere2.love love: - rm -fr supersphere.love - zip -r dist/supersphere.love assets vendor *.lua + rm -fr supersphere2.love + zip -r dist/supersphere2.love assets vendor *.lua ios: - # mv conf.lua conf.default.lua - # mv conf.mobile.lua conf.lua + mv conf.lua conf.default.lua + mv conf.mobile.lua conf.lua $(MAKE) love - # mv conf.lua conf.mobile.lua - # mv conf.default.lua conf.lua + mv conf.lua conf.mobile.lua + mv conf.default.lua conf.lua mac: love - mv dist/supersphere.love dist/macos/Super\ Sphere.app/Contents/Resources/supersphere.love - cd dist/macos && zip -r supersphere-app-OSX.zip * - mv dist/macos/supersphere-app-OSX.zip dist/ - rm -fr dist/macos/Super\ Sphere.app/Contents/Resources/supersphere.love + mv dist/supersphere2.love dist/macos/Super\ Sphere\ II.app/Contents/Resources/supersphere2.love + cd dist/macos && zip -r supersphere2-app-OSX.zip * + mv dist/macos/supersphere2-app-OSX.zip dist/ + rm -fr dist/macos/Super\ Sphere\ II.app/Contents/Resources/supersphere.love -windows: - # mv conf.lua conf.default.lua - # mv conf.windows.lua conf.lua - $(MAKE) love +windows: love - # mv conf.lua conf.windows.lua - # mv conf.default.lua conf.lua - - cd dist/windows && cat .love.exe ../supersphere.love > SuperSphere.exe + cd dist/windows && cat .love.exe ../supersphere2.love > SuperSphereII.exe # winresourcer --operation=Update --exeFile=dist/windows/SuperSphere.exe --resourceType=Icongroup --resourceName:1 --resourceFile:dist/windows/game.ico # winresourcer --operation=Update --exeFile=dist/windows/SuperSphere.exe --resourceType=Icon --resourceName:4 --resourceFile:dist/windows/game.ico # winresourcer --operation=Update --exeFile=dist/windows/SuperSphere.exe --resourceType=Icon --resourceName:5 --resourceFile:dist/windows/game.ico - cd dist/windows && zip -r supersphere-WIN.zip * - mv dist/windows/supersphere-WIN.zip dist/ - rm -fr dist/supersphere.love - rm -fr dist/windows/SuperSphere.exe + cd dist/windows && zip -r supersphere2-WIN.zip * + mv dist/windows/supersphere2-WIN.zip dist/ + rm -fr dist/supersphere2.love + rm -fr dist/windows/SuperSphereII.exe android: mv conf.lua conf.default.lua diff --git a/conf.lua b/conf.lua index 86c27b0..f5d1167 100644 --- a/conf.lua +++ b/conf.lua @@ -39,6 +39,6 @@ function love.conf(t) t.window.width = 1024 -- The window width (number) t.window.height = 768 -- The window height (number) - t.window.fullscreen = true -- Enable fullscreen (boolean) + t.window.fullscreen = false -- Enable fullscreen (boolean) end \ No newline at end of file diff --git a/conf.mobile.lua b/conf.mobile.lua new file mode 100644 index 0000000..b8bda8e --- /dev/null +++ b/conf.mobile.lua @@ -0,0 +1,44 @@ +function love.conf(t) + + t.identity = "super_sphere2" -- The name of the save directory (string) + -- t.version = "0.9" -- The LÖVE version this game was made for (string) + t.console = false -- Attach a console (boolean, Windows only) + t.author = "KennethReitz" -- Who made this? + t.window.title = "Super Sphere II" -- The window title (string) + -- t.window.icon = "love_block.png" -- Filepath to an image to use as the window's icon (string) + + -- customize + t.window.borderless = false -- Remove all border visuals from the window (boolean) + t.window.fullscreentype = "desktop" -- Standard fullscreen or desktop fullscreen mode (string) + t.window.vsync = true -- Enable vertical sync (boolean) + t.window.fsaa = 16 -- The number of samples to use with multi-sampled antialiasing (number) + t.window.display = 1 -- Index of the monitor to show the window in (number) + t.window.srgb = false -- Enable sRGB gamma correction when drawing to the screen (boolean). Added in 0.9.1 + + -- no touching + t.window.resizable = true -- Let the window be user-resizable (boolean) + t.window.highdpi = true -- Enable high-dpi mode for the window on a Retina display (boolean). Added in 0.9.1 + -- t.window.minwidth = 1 -- Minimum window width if the window is resizable (number) + -- t.window.minheight = 1 -- Minimum window height if the window is resizable (number) + + -- Not-Yet-Needed Modules + t.modules.audio = true -- Enable the audio module (boolean) + t.modules.physics = false -- Enable the physics module (boolean) + t.modules.sound = true -- Enable the sound module (boolean) + t.modules.math = false -- Enable the math module (boolean) + -- Very-Much-Needed Modules + t.modules.joystick = true -- Enable the joystick module (boolean) + t.modules.event = true -- Enable the event module (boolean) + t.modules.image = true -- Enable the image module (boolean) + t.modules.timer = true -- Enable the timer module (boolean) + t.modules.graphics = true -- Enable the graphics module (boolean) + t.modules.keyboard = true -- Enable the keyboard module (boolean) + t.modules.mouse = true -- Enable the mouse module (boolean) + t.modules.system = true -- Enable the system module (boolean) + t.modules.window = true -- Enable the window module (boolean) + + t.window.width = 0 -- The window width (number) + t.window.height = 0 -- The window height (number) + t.window.fullscreen = true -- Enable fullscreen (boolean) + +end \ No newline at end of file