From 088dabdf7a2b3509c1335ff774a759e21b464b14 Mon Sep 17 00:00:00 2001 From: Shariq Shah Date: Tue, 22 Oct 2019 17:09:32 +1100 Subject: [PATCH] Changes to build file for mac builds --- build/genie.lua | 24 ++++++++++++++++++++++++ lib/mac/.DS_Store | Bin 6148 -> 6148 bytes src/game/renderer.c | 2 +- todo.txt | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/build/genie.lua b/build/genie.lua index 92bc906..d66a451 100644 --- a/build/genie.lua +++ b/build/genie.lua @@ -77,6 +77,30 @@ solution "Symmetry" libdirs {"../lib/mac/sdl2/", "../lib/mac/soloud/", "../lib/mac/ode/"} links {"SDL2", "m", "ode", "pthread", "soloud"} + configuration {"macosx", "Debug"} + postbuildcommands + { + 'cp ../../lib/mac/sdl2/libSDL2-2.0.0.dylib debug/', + 'cp ../../lib/mac/soloud/libsoloud.dylib debug/', + 'cp ../../lib/mac/ode/libode.0.16.0.dylib debug/', + 'install_name_tool -add_rpath @executable_path/. debug/Symmetry', + 'install_name_tool -change "/usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib" "@rpath/libSDL2-2.0.0.dylib" debug/Symmetry', + 'install_name_tool -change "/Users/shariqshah/Dev/ode/build_cmake/libode.0.16.0.dylib" "@rpath/libode.0.16.0.dylib" debug/Symmetry', + 'install_name_tool -change "/usr/local/lib/libsoloud.dylib" "@rpath/libsoloud.dylib" debug/Symmetry', + } + + configuration {"macosx", "Release"} + postbuildcommands + { + 'cp ../../lib/mac/sdl2/libSDL2-2.0.0.dylib release/', + 'cp ../../lib/mac/soloud/libsoloud.dylib release/', + 'cp ../../lib/mac/ode/libode.0.16.0.dylib release/', + 'install_name_tool -add_rpath @executable_path/. release/Symmetry', + 'install_name_tool -change "/usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib" "@rpath/libSDL2-2.0.0.dylib" release/Symmetry', + 'install_name_tool -change "/Users/shariqshah/Dev/ode/build_cmake/libode.0.16.0.dylib" "@rpath/libode.0.16.0.dylib" release/Symmetry', + 'install_name_tool -change "/usr/local/lib/libsoloud.dylib" "@rpath/libsoloud.dylib" release/Symmetry', + } + configuration {"windows", "vs2017"} includedirs {"../include/windows/sdl2/", "../include/common/soloud/", "../include/windows/"} libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/", "../lib/windows/ode/"} diff --git a/lib/mac/.DS_Store b/lib/mac/.DS_Store index ee88a6a8d1766647de37f6345bbbd1a42068a972..6f55299931e6055e9d35340153acc5ed5214cb55 100644 GIT binary patch delta 360 zcmZoMXfc=|#>B)qu~2NHo}vf~0|Nsi1A_oVa!yiyeh!eyz_yu@aRnnI%ft)H^-1N$ z1xY#iNkHLKNd-BX#U%y?*BP0ZSycQVcdHxE>+{ zwkcjfvbx&X&|F8s$k3=(N1@u#!~n=KH@B><<>U}oHMI3i$gQlZuBok?1#~VDFoJvo z0{jpPPR<6h*cgf#@)>e~xRfC!r5MTkND{m$Wx+*xIr(|%Kpl+0a5>AenVo~50~mfl a&Ufa?{33<|AX^$h@?gZkusJ|v3o`&w7g?qN delta 162 zcmZoMXfc=|#>CJ*u~2NHo}wr-0|Nsi1A_nqLq0window, &width, &height); - glViewport(0, 0, width, height); + glViewport(0, 0, width * 2, height * 2); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); shader_bind(renderer->composition_shader); int final_render_tex = active_camera->render_tex == -1 ? renderer->def_albedo_tex : active_camera->render_tex; diff --git a/todo.txt b/todo.txt index 08dfcc1..ea293bc 100644 --- a/todo.txt +++ b/todo.txt @@ -1,4 +1,5 @@ Todo: + - Implement HiDPI support - Implement/Fix copying libraries to executable folder after build completes on mac os - Fix all sound related bugs before moving on and finish sound serialization to file