jyapayne/nim-sdl2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Potentially fix win and linux building

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2020-05-05 08:05:24 -06:00
commit dbaa8e9a7a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sdl2/sdl2.nim
View file

@ -157,14 +157,14 @@ static:
when defined(SDL_Static): when defined(SDL_Static):
when defined(windows): when defined(windows):
#TODO: Find a way to automate this on Windows reliably #TODO: Find a way to automate this on Windows reliably
const conf = "-lmingw32 -lSDL2main -lSDL2 -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc" const conf = &"-lmingw32 {SDLStaticLib} {SDLMainLib} -mwindows -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -Wl,--high-entropy-va -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc"
else: else:
const cmd = &"cd {srcDir.sanitizePath} && bash ./sdl2-config --static-libs" const cmd = &"cd {srcDir.sanitizePath} && bash ./sdl2-config --static-libs"
const conf = execAction(cmd).output.getLibOutput.replace("-lSDL2", SDLStaticLib) const conf = execAction(cmd).output.getLibOutput.replace("-lSDL2", SDLStaticLib)
else: else:
when defined(windows): when defined(windows):
#TODO: Find a way to automate this on Windows reliably #TODO: Find a way to automate this on Windows reliably
const conf = "-lmingw32 -lSDL2main -lSDL2 -mwindows" const conf = &"-L{buildDir} -lmingw32 -lSDL2main -lSDL2 -mwindows"
else: else:
const cmd = &"cd {srcDir} && bash ./sdl2-config --libs" const cmd = &"cd {srcDir} && bash ./sdl2-config --libs"
const conf = execAction(cmd).output.getLibOutput const conf = execAction(cmd).output.getLibOutput