forked from dail8859/LuaScript
-
Notifications
You must be signed in to change notification settings - Fork 0
GLuaScript #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bilenkonito
wants to merge
3
commits into
bilenkonito:master
Choose a base branch
from
Metastruct:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
GLuaScript #1
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| ############################################################################### | ||
| # Set default behavior to automatically normalize line endings. | ||
| ############################################################################### | ||
| * text=auto | ||
|
|
||
| ############################################################################### | ||
| # Set default behavior for command prompt diff. | ||
| # | ||
| # This is need for earlier builds of msysgit that does not have it on by | ||
| # default for csharp files. | ||
| # Note: This is only used by command line | ||
| ############################################################################### | ||
| #*.cs diff=csharp | ||
|
|
||
| ############################################################################### | ||
| # Set the merge driver for project and solution files | ||
| # | ||
| # Merging from the command prompt will add diff markers to the files if there | ||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | ||
| # the diff markers are never inserted). Diff markers may cause the following | ||
| # file extensions to fail to load in VS. An alternative would be to treat | ||
| # these files as binary and thus will always conflict and require user | ||
| # intervention with every merge. To do so, just uncomment the entries below | ||
| ############################################################################### | ||
| #*.sln merge=binary | ||
| #*.csproj merge=binary | ||
| #*.vbproj merge=binary | ||
| #*.vcxproj merge=binary | ||
| #*.vcproj merge=binary | ||
| #*.dbproj merge=binary | ||
| #*.fsproj merge=binary | ||
| #*.lsproj merge=binary | ||
| #*.wixproj merge=binary | ||
| #*.modelproj merge=binary | ||
| #*.sqlproj merge=binary | ||
| #*.wwaproj merge=binary | ||
|
|
||
| ############################################################################### | ||
| # behavior for image files | ||
| # | ||
| # image files are treated as binary by default. | ||
| ############################################################################### | ||
| #*.jpg binary | ||
| #*.png binary | ||
| #*.gif binary | ||
|
|
||
| ############################################################################### | ||
| # diff behavior for common document formats | ||
| # | ||
| # Convert binary document formats to text before diffing them. This feature | ||
| # is only available from the command line. Turn it on by uncommenting the | ||
| # entries below. | ||
| ############################################################################### | ||
| #*.doc diff=astextplain | ||
| #*.DOC diff=astextplain | ||
| #*.docx diff=astextplain | ||
| #*.DOCX diff=astextplain | ||
| #*.dot diff=astextplain | ||
| #*.DOT diff=astextplain | ||
| #*.pdf diff=astextplain | ||
| #*.PDF diff=astextplain | ||
| #*.rtf diff=astextplain | ||
| #*.RTF diff=astextplain |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | ||||||
| <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||||
| <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||||
| <ItemGroup Label="ProjectConfigurations"> | ||||||
| <ProjectConfiguration Include="Debug|Win32"> | ||||||
| <Configuration>Debug</Configuration> | ||||||
|
|
@@ -22,29 +22,29 @@ | |||||
| <ProjectGuid>{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}</ProjectGuid> | ||||||
| <RootNamespace>LuaScript</RootNamespace> | ||||||
| <Keyword>Win32Proj</Keyword> | ||||||
| <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||||
| <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> | ||||||
| </PropertyGroup> | ||||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||||
| <CharacterSet>Unicode</CharacterSet> | ||||||
| <PlatformToolset>v140_xp</PlatformToolset> | ||||||
| <PlatformToolset>v141</PlatformToolset> | ||||||
| </PropertyGroup> | ||||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||||||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||||
| <CharacterSet>Unicode</CharacterSet> | ||||||
| <PlatformToolset>v140_xp</PlatformToolset> | ||||||
| <PlatformToolset>v141_xp</PlatformToolset> | ||||||
| </PropertyGroup> | ||||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||||||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||||
| <CharacterSet>Unicode</CharacterSet> | ||||||
| <PlatformToolset>v140_xp</PlatformToolset> | ||||||
| <PlatformToolset>v141</PlatformToolset> | ||||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||||||
| </PropertyGroup> | ||||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||||||
| <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||||
| <CharacterSet>Unicode</CharacterSet> | ||||||
| <PlatformToolset>v140_xp</PlatformToolset> | ||||||
| <PlatformToolset>v141_xp</PlatformToolset> | ||||||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||||||
| </PropertyGroup> | ||||||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||||||
|
|
@@ -108,7 +108,7 @@ | |||||
| <SDLCheck>true</SDLCheck> | ||||||
| </ClCompile> | ||||||
| <Link> | ||||||
| <AdditionalDependencies>Lua.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||||
| <AdditionalDependencies>x:\do\GMod\gbins\lua51\lua_shared.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||||
| <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile> | ||||||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||||||
| <SubSystem>Windows</SubSystem> | ||||||
|
|
@@ -121,7 +121,7 @@ | |||||
| <AdditionalLibraryDirectories>$(SolutionDir)bin\$(Configuration)_$(Platform)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||||||
| </Link> | ||||||
| <PostBuildEvent> | ||||||
| <Command>copy "$(TargetPath)" "C:\Program Files (x86)\Notepad++\plugins"</Command> | ||||||
| <Command>copy "$(TargetPath)" "x:\a\npp\plugins"</Command> | ||||||
|
||||||
| </PostBuildEvent> | ||||||
| </ItemDefinitionGroup> | ||||||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||||||
|
|
@@ -164,18 +164,18 @@ | |||||
| <Optimization>Disabled</Optimization> | ||||||
|
||||||
| <AdditionalIncludeDirectories>.\SciTE;.\lua\src;.\Dialogs;.\Npp;.\Utilities;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||||
| <PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;WIN32;_DEBUG;_WINDOWS;_USRDLL;LuaScript_EXPORTS;__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||||
| <MinimalRebuild>true</MinimalRebuild> | ||||||
| <MinimalRebuild>false</MinimalRebuild> | ||||||
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||||||
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||||||
|
||||||
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -1424,6 +1424,8 @@ static bool InitGlobalScope() { | |||||||||
|
|
||||||||||
| // ...register standard libraries | ||||||||||
| luaL_openlibs(luaState); | ||||||||||
| luaopen_base2(luaState); | ||||||||||
|
||||||||||
| luaopen_base2(luaState); | |
| luaopen_base2(luaState); | |
| // luaopen_base2 pushes its library table; pop it to keep the stack balanced | |
| lua_pop(luaState, 1); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These absolute
x:\...paths make the project non-portable and will break builds on other machines/CI. Use a repo-relative path, an MSBuild property (e.g.,$(SolutionDir),$(ProjectDir)), or an environment variable with a reasonable default so contributors can build without editing the project file.