Changes to build file for mac builds

dev
Shariq Shah 6 years ago
parent 4e90bf71b1
commit 088dabdf7a
  1. 24
      build/genie.lua
  2. BIN
      lib/mac/.DS_Store
  3. 2
      src/game/renderer.c
  4. 1
      todo.txt

@ -77,6 +77,30 @@ solution "Symmetry"
libdirs {"../lib/mac/sdl2/", "../lib/mac/soloud/", "../lib/mac/ode/"} libdirs {"../lib/mac/sdl2/", "../lib/mac/soloud/", "../lib/mac/ode/"}
links {"SDL2", "m", "ode", "pthread", "soloud"} 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"} configuration {"windows", "vs2017"}
includedirs {"../include/windows/sdl2/", "../include/common/soloud/", "../include/windows/"} includedirs {"../include/windows/sdl2/", "../include/common/soloud/", "../include/windows/"}
libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/", "../lib/windows/ode/"} libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/", "../lib/windows/ode/"}

BIN
lib/mac/.DS_Store vendored

Binary file not shown.

@ -326,7 +326,7 @@ void renderer_render(struct Renderer* renderer, struct Scene* scene)
int width, height; int width, height;
struct Game_State* game_state = game_state_get(); struct Game_State* game_state = game_state_get();
window_get_size(game_state->window, &width, &height); 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); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
shader_bind(renderer->composition_shader); shader_bind(renderer->composition_shader);
int final_render_tex = active_camera->render_tex == -1 ? renderer->def_albedo_tex : active_camera->render_tex; int final_render_tex = active_camera->render_tex == -1 ? renderer->def_albedo_tex : active_camera->render_tex;

@ -1,4 +1,5 @@
Todo: Todo:
- Implement HiDPI support
- Implement/Fix copying libraries to executable folder after build completes on mac os - Implement/Fix copying libraries to executable folder after build completes on mac os
- Fix all sound related bugs before moving on and finish sound - Fix all sound related bugs before moving on and finish sound
serialization to file serialization to file

Loading…
Cancel
Save