Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: trunk/dev/Examples/ManualUse/SConscript
- ===================================================================
- --- trunk/dev/Examples/ManualUse/SConscript (revision 102)
- +++ trunk/dev/Examples/ManualUse/SConscript (working copy)
- @@ -30,7 +30,8 @@
- if sys.platform=='linux2' or sys.platform=='linux3':
- env_local.AppendUnique(LIBS = ['GL',
- - 'Xxf86vm'] )
- + 'Xxf86vm', 'X11',
- + 'dl'] )
- # add 3rdparty libraries parameters
- thirdparty.lua.addLuaToEnv(env_local)
- Index: trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp
- ===================================================================
- --- trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp (revision 102)
- +++ trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp (working copy)
- @@ -40,6 +40,9 @@
- #include <GL/gl.h>
- #include <GL/glx.h>
- +#ifndef WIN32
- + #include <unistd.h>
- +#endif
- // start time
- Index: trunk/dev/MSDK/MCore/Sources/MFileTools.cpp
- ===================================================================
- --- trunk/dev/MSDK/MCore/Sources/MFileTools.cpp (revision 102)
- +++ trunk/dev/MSDK/MCore/Sources/MFileTools.cpp (working copy)
- @@ -41,6 +41,7 @@
- #define rmdir _rmdir
- #else
- #define mkdir(file) mkdir(file, 0777)
- + #include <unistd.h>
- #endif
- static MFileOpenHook* s_fileOpenHook = 0;
- Index: trunk/dev/Maratis/Editor/SConscript
- ===================================================================
- --- trunk/dev/Maratis/Editor/SConscript (revision 102)
- +++ trunk/dev/Maratis/Editor/SConscript (working copy)
- @@ -34,7 +34,8 @@
- if sys.platform=='linux2' or sys.platform=='linux3':
- env_local.AppendUnique(LIBS = ['GL',
- - 'Xxf86vm'] )
- + 'Xxf86vm','X11',
- + 'dl'] )
- # add 3rdparty libraries parameters
- thirdparty.lua.addLuaToEnv(env_local)
- Index: trunk/dev/Maratis/Player/SConscript
- ===================================================================
- --- trunk/dev/Maratis/Player/SConscript (revision 102)
- +++ trunk/dev/Maratis/Player/SConscript (working copy)
- @@ -35,7 +35,8 @@
- if sys.platform=='linux2' or sys.platform=='linux3':
- env_local.AppendUnique(LIBS = ['GL',
- - 'Xxf86vm'] )
- + 'Xxf86vm','X11',
- + 'dl'] )
- # add 3rdparty libraries parameters
- thirdparty.npk_dev.addNPKDevToEnv(env_local)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement