Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
UltimateZoneBuilder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
UltimateZoneBuilder
Commits
4cfe80f3
Commit
4cfe80f3
authored
5 years ago
by
Magnus Norddahl
Browse files
Options
Downloads
Patches
Plain Diff
GZDB can now boot using mono
parent
159a2e6d
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/Core/BuilderMono.csproj
+8
-8
8 additions, 8 deletions
Source/Core/BuilderMono.csproj
Source/Core/General/General.cs
+13
-0
13 additions, 0 deletions
Source/Core/General/General.cs
with
21 additions
and
8 deletions
Source/Core/BuilderMono.csproj
+
8
−
8
View file @
4cfe80f3
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|x86' "
>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|x86' "
>
<DebugSymbols>
true
</DebugSymbols>
<DebugSymbols>
true
</DebugSymbols>
<OutputPath>
..\..\Build\
</OutputPath>
<OutputPath>
..\..\Build\
</OutputPath>
<DefineConstants>
TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<DebugType>
full
</DebugType>
<DebugType>
full
</DebugType>
<PlatformTarget>
x86
</PlatformTarget>
<PlatformTarget>
x86
</PlatformTarget>
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<ErrorReport>
prompt
</ErrorReport>
<ErrorReport>
prompt
</ErrorReport>
<DocumentationFile>
<DocumentationFile>
</DocumentationFile>
</DocumentationFile>
<DefineConstants>
NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
<WarningLevel>
4
</WarningLevel>
<WarningLevel>
4
</WarningLevel>
<DebugSymbols>
true
</DebugSymbols>
<DebugSymbols>
true
</DebugSymbols>
<NoWarn>
1591
</NoWarn>
<NoWarn>
1591
</NoWarn>
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' "
>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug + Profiler|x86' "
>
<DebugSymbols>
true
</DebugSymbols>
<DebugSymbols>
true
</DebugSymbols>
<OutputPath>
..\..\Build\
</OutputPath>
<OutputPath>
..\..\Build\
</OutputPath>
<DefineConstants>
TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<DocumentationFile>
<DocumentationFile>
</DocumentationFile>
</DocumentationFile>
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
<PlatformTarget>
x86
</PlatformTarget>
<PlatformTarget>
x86
</PlatformTarget>
<UseVSHostingProcess>
false
</UseVSHostingProcess>
<UseVSHostingProcess>
false
</UseVSHostingProcess>
<ErrorReport>
prompt
</ErrorReport>
<ErrorReport>
prompt
</ErrorReport>
<DefineConstants>
TRACE;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
<Prefer32Bit>
false
</Prefer32Bit>
<Prefer32Bit>
false
</Prefer32Bit>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Debug|x64'"
>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Debug|x64'"
>
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
</DocumentationFile>
</DocumentationFile>
<Prefer32Bit>
false
</Prefer32Bit>
<Prefer32Bit>
false
</Prefer32Bit>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<DefineConstants>
TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Release|x64'"
>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Release|x64'"
>
<PlatformTarget>
x64
</PlatformTarget>
<PlatformTarget>
x64
</PlatformTarget>
...
@@ -97,14 +97,14 @@
...
@@ -97,14 +97,14 @@
<Prefer32Bit>
false
</Prefer32Bit>
<Prefer32Bit>
false
</Prefer32Bit>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<Optimize>
true
</Optimize>
<Optimize>
true
</Optimize>
<DefineConstants>
TRACE;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Debug + Profiler|x64'"
>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Debug + Profiler|x64'"
>
<PlatformTarget>
x64
</PlatformTarget>
<PlatformTarget>
x64
</PlatformTarget>
<OutputPath>
..\..\Build\
</OutputPath>
<OutputPath>
..\..\Build\
</OutputPath>
<Prefer32Bit>
false
</Prefer32Bit>
<Prefer32Bit>
false
</Prefer32Bit>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<DefineConstants>
TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
TRACE;DEBUG;PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Release + Profiler|x64'"
>
<PropertyGroup
Condition=
"'$(Configuration)|$(Platform)' == 'Release + Profiler|x64'"
>
<PlatformTarget>
x64
</PlatformTarget>
<PlatformTarget>
x64
</PlatformTarget>
...
@@ -112,7 +112,7 @@
...
@@ -112,7 +112,7 @@
<Prefer32Bit>
false
</Prefer32Bit>
<Prefer32Bit>
false
</Prefer32Bit>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<AllowUnsafeBlocks>
true
</AllowUnsafeBlocks>
<Optimize>
true
</Optimize>
<Optimize>
true
</Optimize>
<DefineConstants>
PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
</DefineConstants>
<DefineConstants>
PROFILE NO_SCINTILLA NO_FORMS_DESIGN NO_DEVIL
NO_WIN32
</DefineConstants>
</PropertyGroup>
</PropertyGroup>
<Import
Project=
"$(MSBuildBinPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(MSBuildBinPath)\Microsoft.CSharp.targets"
/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
...
...
This diff is collapsed.
Click to expand it.
Source/Core/General/General.cs
+
13
−
0
View file @
4cfe80f3
...
@@ -54,6 +54,14 @@ namespace CodeImp.DoomBuilder
...
@@ -54,6 +54,14 @@ namespace CodeImp.DoomBuilder
private
static
extern
void
ilInit
();
private
static
extern
void
ilInit
();
#endif
#endif
#if NO_WIN32
internal
static
bool
LockWindowUpdate
(
IntPtr
hwnd
)
{
return
true
;
}
internal
static
bool
MessageBeep
(
MessageBeepType
type
)
{
return
true
;
}
internal
static
void
ZeroMemory
(
IntPtr
dest
,
int
size
)
{
}
internal
static
int
SendMessage
(
IntPtr
hwnd
,
uint
Msg
,
IntPtr
wParam
,
IntPtr
lParam
)
{
return
0
;
}
#else
[
DllImport
(
"user32.dll"
)]
[
DllImport
(
"user32.dll"
)]
internal
static
extern
bool
LockWindowUpdate
(
IntPtr
hwnd
);
internal
static
extern
bool
LockWindowUpdate
(
IntPtr
hwnd
);
...
@@ -94,6 +102,7 @@ namespace CodeImp.DoomBuilder
...
@@ -94,6 +102,7 @@ namespace CodeImp.DoomBuilder
//[DllImport("user32.dll")]
//[DllImport("user32.dll")]
//internal static extern int GetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo);
//internal static extern int GetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo);
#endif
#
endregion
#
endregion
...
@@ -2044,10 +2053,14 @@ namespace CodeImp.DoomBuilder
...
@@ -2044,10 +2053,14 @@ namespace CodeImp.DoomBuilder
// This returns the short path name for a file
// This returns the short path name for a file
public
static
string
GetShortFilePath
(
string
longpath
)
public
static
string
GetShortFilePath
(
string
longpath
)
{
{
#if NO_WIN32
return
longpath
;
#else
const
int
maxlen
=
256
;
const
int
maxlen
=
256
;
StringBuilder
shortname
=
new
StringBuilder
(
maxlen
);
StringBuilder
shortname
=
new
StringBuilder
(
maxlen
);
GetShortPathName
(
longpath
,
shortname
,
maxlen
);
GetShortPathName
(
longpath
,
shortname
,
maxlen
);
return
shortname
.
ToString
();
return
shortname
.
ToString
();
#endif
}
}
//mxd
//mxd
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment