windows

git-svn-id: http://svn.net-core.org/repos/t-engine4@502 51575b47-30f0-44d4-a5cc-537603b46e54

game/special/mainmenu/class/Game.lua

@@ -136,7 +136,7 @@ function _M:selectStepMain()
 				self:selectStepInstall()
 			end,
 		},
-]]
+--]]
 		{
 			name = "Exit",
 			fct = function()

premake4.lua

@@ -84,7 +84,7 @@ configuration "macosx"
 
 configuration "windows"
 	linkoptions { "-mwindows" }
-	links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32" }
+	links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" }
 	defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' }
 
 configuration "linux"

src/lualanes/threading.h

@@ -37,7 +37,7 @@ typedef unsigned int uint_t;
 /* Do this BEFORE including time.h so that it is declaring _mktime32()
  * as it would have declared mktime().
  */
-# define mktime _mktime32
+//# define mktime _mktime32
 #endif
 #include <time.h>