diff --git a/build/TEngine.make b/build/TEngine.make
index 9001b22c817afe812399a6c028019b4485e25187..2267625f57e192ea5c8fc9f1ea4d91e60cf080dc 100644
--- a/build/TEngine.make
+++ b/build/TEngine.make
@@ -29,7 +29,7 @@ ifeq ($(config),debug)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -g -fPIC -ggdb -fPIC
   CXXFLAGS  += $(CFLAGS) 
   LDFLAGS   += -shared -L../bin/Debug
-  LIBS      += -lphysfs -llua -lfov -lluasocket -lluaprofiler -llualanes -llpeg -ltcodimport -llxp -lexpatstatic -lluamd5 -lluazlib -lSDL -lSDL_ttf -lSDL_image -lSDL_mixer -lGL -lGLU -lm -lpthread
+  LIBS      += -lphysfs -llua -lfov -lluasocket -lluaprofiler -llualanes -llpeg -ltcodimport -llxp -lexpatstatic -lluamd5 -lluazlib
   RESFLAGS  += $(DEFINES) $(INCLUDES) 
   LDDEPS    += ../bin/Debug/libphysfs.a ../bin/Debug/liblua.a ../bin/Debug/libfov.a ../bin/Debug/libluasocket.a ../bin/Debug/libluaprofiler.a ../bin/Debug/liblualanes.a ../bin/Debug/liblpeg.a ../bin/Debug/libtcodimport.a ../bin/Debug/liblxp.a ../bin/Debug/libexpatstatic.a ../bin/Debug/libluamd5.a ../bin/Debug/libluazlib.a
   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@@ -53,7 +53,7 @@ ifeq ($(config),release)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -O2 -fomit-frame-pointer -fPIC -O3 -fPIC
   CXXFLAGS  += $(CFLAGS) 
   LDFLAGS   += -s -shared -L../bin/Release
-  LIBS      += -lphysfs -llua -lfov -lluasocket -lluaprofiler -llualanes -llpeg -ltcodimport -llxp -lexpatstatic -lluamd5 -lluazlib -lSDL -lSDL_ttf -lSDL_image -lSDL_mixer -lGL -lGLU -lm -lpthread
+  LIBS      += -lphysfs -llua -lfov -lluasocket -lluaprofiler -llualanes -llpeg -ltcodimport -llxp -lexpatstatic -lluamd5 -lluazlib
   RESFLAGS  += $(DEFINES) $(INCLUDES) 
   LDDEPS    += ../bin/Release/libphysfs.a ../bin/Release/liblua.a ../bin/Release/libfov.a ../bin/Release/libluasocket.a ../bin/Release/libluaprofiler.a ../bin/Release/liblualanes.a ../bin/Release/liblpeg.a ../bin/Release/libtcodimport.a ../bin/Release/liblxp.a ../bin/Release/libexpatstatic.a ../bin/Release/libluamd5.a ../bin/Release/libluazlib.a
   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
diff --git a/build/TEngineRunner.make b/build/TEngineRunner.make
index 30bebbe8b422f5dbd2ff77157bcb3e73ef113234..e8f4b508869a64868a54d62498e704a13b1ee0ee 100644
--- a/build/TEngineRunner.make
+++ b/build/TEngineRunner.make
@@ -29,7 +29,7 @@ ifeq ($(config),debug)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -g -ggdb
   CXXFLAGS  += $(CFLAGS) 
   LDFLAGS   += -L../bin/Debug
-  LIBS      += -lrunner-physfs -lrunner-lua -lm -ldl -lpthread
+  LIBS      += -lrunner-physfs -lrunner-lua -lm -ldl -lSDL -lSDL_ttf -lSDL_image -lSDL_mixer -lGL -lGLU -lpthread
   RESFLAGS  += $(DEFINES) $(INCLUDES) 
   LDDEPS    += ../bin/Debug/librunner-physfs.a ../bin/Debug/librunner-lua.a
   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
@@ -53,7 +53,7 @@ ifeq ($(config),release)
   CFLAGS    += $(CPPFLAGS) $(ARCH) -O2 -fomit-frame-pointer -O3
   CXXFLAGS  += $(CFLAGS) 
   LDFLAGS   += -s -L../bin/Release
-  LIBS      += -lrunner-physfs -lrunner-lua -lm -ldl -lpthread
+  LIBS      += -lrunner-physfs -lrunner-lua -lm -ldl -lSDL -lSDL_ttf -lSDL_image -lSDL_mixer -lGL -lGLU -lpthread
   RESFLAGS  += $(DEFINES) $(INCLUDES) 
   LDDEPS    += ../bin/Release/librunner-physfs.a ../bin/Release/librunner-lua.a
   LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
diff --git a/build/runner.lua b/build/runner.lua
index 200d105f1de1434cf5a03eb01273c98c0a3891f8..253df0956ffee14f357ea8ccddc8fc1834644112 100644
--- a/build/runner.lua
+++ b/build/runner.lua
@@ -25,13 +25,16 @@ project "TEngineRunner"
 	links { "runner-physfs", "runner-lua", "m" }
 
 	configuration "linux"
-		links { "dl", "pthread" }
+		links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" }
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX'  }
 
 	configuration "windows"
+		links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
 	configuration "macosx"
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX'  }
+		linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" }
+        	links { "IOKit" }
 
 	configuration {"Debug"}
 		postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", }
diff --git a/build/te4core.lua b/build/te4core.lua
index 6d66c5cff2cc092176f939754b4fe2f4a6894556..45e0128de734a9d9dce02a2432d85da4807f754a 100644
--- a/build/te4core.lua
+++ b/build/te4core.lua
@@ -29,9 +29,7 @@ project "TEngine"
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 
 configuration "macosx"
-	linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" }
 	files { "../src/mac/SDL*" }
-        links { "IOKit" }
         includedirs {
               "/System/Library/Frameworks/OpenGL.framework/Headers",
               "/Library/Frameworks/SDL.framework/Headers",
@@ -45,7 +43,7 @@ configuration "macosx"
 
 configuration "windows"
 	linkoptions { "-mwindows" }
-	links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" }
+	links { "mingw32" }
 	defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' }
 	prebuildcommands { "windres src/windows/icon.rc -O coff -o src/windows/icon.res" }
 	linkoptions { "src/windows/icon.res" }
@@ -53,7 +51,6 @@ configuration "windows"
 
 configuration "linux"
 	buildoptions { "-fPIC" }
-	links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" }
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' }
 
 configuration {"linux", "Debug"}