diff --git a/GGELUA.sln b/GGELUA.sln index dfcdca9..f1c6010 100644 --- a/GGELUA.sln +++ b/GGELUA.sln @@ -38,7 +38,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luasql", "luasql\luasql.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzmq", "lzmq\lzmq.vcxproj", "{F0586B55-BD50-4E58-89A8-D957D941B4D7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-mongo", "lua-mongo\lua-mongo.vcxproj", "{E0E8A6E0-EC75-4078-8ED9-35A72C39444C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mongo", "lua-mongo\lua-mongo.vcxproj", "{E0E8A6E0-EC75-4078-8ED9-35A72C39444C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/cjson/cjson.vcxproj b/cjson/cjson.vcxproj index 32250b7..1cf085e 100644 --- a/cjson/cjson.vcxproj +++ b/cjson/cjson.vcxproj @@ -126,7 +126,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,8 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) + diff --git a/gastar/gastar.vcxproj b/gastar/gastar.vcxproj index 7072ef2..856054b 100644 --- a/gastar/gastar.vcxproj +++ b/gastar/gastar.vcxproj @@ -127,7 +127,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -156,7 +156,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/gffmpeg/gffmpeg.vcxproj b/gffmpeg/gffmpeg.vcxproj index a2cc1ff..129107d 100644 --- a/gffmpeg/gffmpeg.vcxproj +++ b/gffmpeg/gffmpeg.vcxproj @@ -124,7 +124,7 @@ lua54.lib;gsdl2.lib;libavcodec.lib;libavformat.lib;libavutil.lib;libswresample.lib;libswscale.lib;libpostproc.lib;libavfilter.lib;libavdevice.lib;%(AdditionalDependencies) - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -146,7 +146,7 @@ - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/ggedll/ggelua.vcxproj b/ggedll/ggelua.vcxproj index b342c3c..4b9da18 100644 --- a/ggedll/ggelua.vcxproj +++ b/ggedll/ggelua.vcxproj @@ -136,7 +136,7 @@ ..\library\x86 - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\ + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\$(TargetFileName) @@ -175,7 +175,7 @@ ..\library\x64; - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\ + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\$(TargetFileName) diff --git a/ggelua/GGELUA.vcxproj b/ggelua/GGELUA.vcxproj index 3c5344a..6431575 100644 --- a/ggelua/GGELUA.vcxproj +++ b/ggelua/GGELUA.vcxproj @@ -126,7 +126,7 @@ mainCRTStartup - copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R32 + copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R32\$(TargetName).exe @@ -170,7 +170,7 @@ mainCRTStartup - copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R64 + copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R64\$(TargetName).exe diff --git a/ggelua/main.c b/ggelua/main.c index 286726d..aeba09e 100644 --- a/ggelua/main.c +++ b/ggelua/main.c @@ -4,7 +4,7 @@ #include "SDL_stdinc.h" #include "SDL_mutex.h" #include "SDL_messagebox.h" - +#include struct INFO { unsigned int signal; unsigned int coresize; diff --git a/ghpsocket/ghpsocket.vcxproj b/ghpsocket/ghpsocket.vcxproj index b96ec6f..2b4bf71 100644 --- a/ghpsocket/ghpsocket.vcxproj +++ b/ghpsocket/ghpsocket.vcxproj @@ -126,7 +126,7 @@ HPSocket.lib;SDL2.lib;lua54.lib;%(AdditionalDependencies) - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/gimgui/gimgui.vcxproj b/gimgui/gimgui.vcxproj index 8435f3e..87df306 100644 --- a/gimgui/gimgui.vcxproj +++ b/gimgui/gimgui.vcxproj @@ -126,7 +126,7 @@ ..\library\x86 - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/gip/gip.vcxproj b/gip/gip.vcxproj index 4a4bd72..2e52dc2 100644 --- a/gip/gip.vcxproj +++ b/gip/gip.vcxproj @@ -126,7 +126,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/gsdl2/luasdl2.vcxproj b/gsdl2/luasdl2.vcxproj index 4119f3e..e864b4f 100644 --- a/gsdl2/luasdl2.vcxproj +++ b/gsdl2/luasdl2.vcxproj @@ -172,7 +172,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -193,7 +193,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/lsqlite3/lsqlite3.vcxproj b/lsqlite3/lsqlite3.vcxproj index 4f92468..20dd2e3 100644 --- a/lsqlite3/lsqlite3.vcxproj +++ b/lsqlite3/lsqlite3.vcxproj @@ -126,7 +126,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/lua-mongo/lua-mongo.vcxproj b/lua-mongo/lua-mongo.vcxproj index f5ab58f..e047391 100644 --- a/lua-mongo/lua-mongo.vcxproj +++ b/lua-mongo/lua-mongo.vcxproj @@ -113,6 +113,9 @@ ..\library\x86 lua54.lib;bson.lib;mongoc.lib;%(AdditionalDependencies) + + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) + @@ -147,6 +150,9 @@ + + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) + diff --git a/lua/lua.vcxproj b/lua/lua.vcxproj index 04b8a01..da4ba16 100644 --- a/lua/lua.vcxproj +++ b/lua/lua.vcxproj @@ -113,7 +113,7 @@ ..\library\x86 - copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R32 + copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R32\$(TargetName).exe @@ -147,7 +147,7 @@ ..\library\x64 - copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R64 + copy /y "$(OutDir)"$(TargetName).exe "$(SolutionDir)"R64\$(TargetFileName) diff --git a/luadll/luadll.vcxproj b/luadll/luadll.vcxproj index 499662f..f6ece04 100644 --- a/luadll/luadll.vcxproj +++ b/luadll/luadll.vcxproj @@ -88,9 +88,9 @@ false - copy /y "$(OutDir)"$(TargetName).dll "$(SolutionDir)"R32 -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"library -copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"R32\插件开发\library + copy /y "$(OutDir)"$(TargetName).dll "$(SolutionDir)"R32\$(TargetName).dll +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"library\x86\$(TargetName).lib +copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"R32\插件开发\library\$(TargetName).lib @@ -106,8 +106,8 @@ copy /y "$(OutDir)"$(TargetName).lib "$(SolutionDir)"R32\插件开发\librarySpeed - copy /y "$(OutDir)"$(TargetName).dll "$(SolutionDir)"R64 -copy /y "$(OutDir)"$(TargetName)_64.lib "$(SolutionDir)"library + copy /y "$(OutDir)"$(TargetName).dll "$(SolutionDir)"R64\$(TargetName).dll +copy /y "$(OutDir)"$(TargetName)_64.lib "$(SolutionDir)"library\x64\$(TargetName)_64.lib copy /y "$(OutDir)"$(TargetName)_64.lib "$(SolutionDir)"R64\插件开发\library diff --git a/luasql/luasql.vcxproj b/luasql/luasql.vcxproj index 35cc529..7d3d697 100644 --- a/luasql/luasql.vcxproj +++ b/luasql/luasql.vcxproj @@ -128,7 +128,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -154,7 +154,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/lzmq/lzmq.vcxproj b/lzmq/lzmq.vcxproj index 1e272f9..6bfcb9e 100644 --- a/lzmq/lzmq.vcxproj +++ b/lzmq/lzmq.vcxproj @@ -126,7 +126,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName) diff --git a/socket/socket.vcxproj b/socket/socket.vcxproj index 25130d6..4b66b2b 100644 --- a/socket/socket.vcxproj +++ b/socket/socket.vcxproj @@ -113,7 +113,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKET_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKET_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) ..\include MultiThreaded @@ -126,7 +126,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R32\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R32\lib\$(TargetFileName) @@ -137,7 +137,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKET_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKET_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) ..\include;%(AdditionalIncludeDirectories) MultiThreaded @@ -150,7 +150,7 @@ false - copy /y $(OutDir)$(TargetFileName) $(SolutionDir)..\GGELUA\R64\lib + copy /y "$(OutDir)"$(TargetFileName) "$(SolutionDir)"R64\lib\$(TargetFileName)