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 ee88a6a..6f55299 100644 Binary files a/lib/mac/.DS_Store and b/lib/mac/.DS_Store differ diff --git a/src/game/renderer.c b/src/game/renderer.c index a003c6d..45b6efd 100755 --- a/src/game/renderer.c +++ b/src/game/renderer.c @@ -326,7 +326,7 @@ void renderer_render(struct Renderer* renderer, struct Scene* scene) int width, height; struct Game_State* game_state = game_state_get(); window_get_size(game_state->window, &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