Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
63dc11db
Commit
63dc11db
authored
Sep 21, 2011
by
U-eee\Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cygwin fix for plc compile
parent
45b0f4d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
wb/exp/com/src/os_cygwin/wb_gcg.sh
wb/exp/com/src/os_cygwin/wb_gcg.sh
+1
-1
wb/lib/wb/src/wb_gcg.cpp
wb/lib/wb/src/wb_gcg.cpp
+12
-1
No files found.
wb/exp/com/src/os_cygwin/wb_gcg.sh
View file @
63dc11db
...
...
@@ -479,7 +479,7 @@ elif [ $OpSys -eq $OpSys_X86_CYGWIN ]; then
# Suppress all warnings, -x
if
[
$CurrentOpSys
-eq
$OpSys
]
;
then
cc_cmd
=
"gcc -c -x c -w
$cc_debug
-D_REENTRANT -DOS_CYGWIN -DOS_POSIX -I
$pwr_inc
-I
$pwrp_inc
-I
$pwrp_tmp
$PWR_EXT_INC
"
cc_cmd
=
"gcc -c -x c -w
$cc_debug
-D_REENTRANT -DOS_CYGWIN -DOS_POSIX -I
$pwr_inc
-I
$pwrp_inc
-I
$pwrp_tmp
-I/usr/include/tirpc
$PWR_EXT_INC
"
FileTypeStr
=
"
`
echo
$vFileType
|
cut
-f
$FileTypeIdx
-d
,
`
"
...
...
wb/lib/wb/src/wb_gcg.cpp
View file @
63dc11db
...
...
@@ -124,12 +124,14 @@ extern "C" {
#define IS_OPENBSD(os) (os & pwr_mOpSys_X86_64_OPENBSD)
#define IS_CYGWIN(os) (os & pwr_mOpSys_X86_CYGWIN)
#define IS_LINUX(os) ((os & pwr_mOpSys_PPC_LINUX) \
|| (os & pwr_mOpSys_X86_LINUX) \
|| (os & pwr_mOpSys_X86_64_LINUX) \
|| (os & pwr_mOpSys_CustomBuild))
#define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os))
#define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os)
|| IS_CYGWIN(os)
)
#define IS_NOT_UNIX(os) (!IS_UNIX(os))
...
...
@@ -887,6 +889,8 @@ static pwr_tStatus gcg_get_build_host(
strcpy
(
logname
,
"pwr_build_host_x86_64_freebsd"
);
else
if
(
os
&
pwr_mOpSys_X86_64_OPENBSD
)
strcpy
(
logname
,
"pwr_build_host_x86_64_openbsd"
);
else
if
(
os
&
pwr_mOpSys_X86_CYGWIN
)
strcpy
(
logname
,
"pwr_build_host_x86_cygwin"
);
else
if
(
os
&
pwr_mOpSys_CustomBuild
)
strcpy
(
logname
,
"pwr_build_host_custom_build"
);
else
...
...
@@ -4703,6 +4707,7 @@ static int gcg_get_child_plcthread(
(
IS_MACOS
(
os
)
&&
*
scantime_ptr
<
0.0000001
)
||
(
IS_FREEBSD
(
os
)
&&
*
scantime_ptr
<
0.0000001
)
||
(
IS_OPENBSD
(
os
)
&&
*
scantime_ptr
<
0.0000001
)
||
(
IS_CYGWIN
(
os
)
&&
*
scantime_ptr
<
0.0000001
)
||
(
IS_LYNX
(
os
)
&&
((
timebase
<=
0
)
||
((
timebase
/
10
)
*
10
)
!=
timebase
))
||
(
IS_VMS_OR_ELN
(
os
)
&&
((
timebase
<=
0
)
||
((
timebase
/
10
)
*
10
)
!=
timebase
))
)
{
gcg_plc_msg
(
gcgctx
,
GSX__BADSCANTIME
,
objdid
);
...
...
@@ -5245,6 +5250,11 @@ int gcg_comp_rtnode(
strcpy
(
os_str
,
"X86_64_OPENBSD"
);
/* Not used */
max_no_timebase
=
GCG_MAX_NO_TIMEBASE_LINUX
;
break
;
case
pwr_mOpSys_X86_CYGWIN
:
strcpy
(
objdir
,
"xxx"
);
strcpy
(
os_str
,
"X86_CYGWIN"
);
/* Not used */
max_no_timebase
=
GCG_MAX_NO_TIMEBASE_LINUX
;
break
;
case
pwr_mOpSys_CustomBuild
:
strcpy
(
objdir
,
"xxx"
);
strcpy
(
os_str
,
"CustomBuild"
);
/* Not used */
...
...
@@ -5476,6 +5486,7 @@ int gcg_comp_rtnode(
case
pwr_mOpSys_X86_64_MACOS
:
case
pwr_mOpSys_X86_64_FREEBSD
:
case
pwr_mOpSys_X86_64_OPENBSD
:
case
pwr_mOpSys_X86_CYGWIN
:
case
pwr_mOpSys_X86_LYNX
:
case
pwr_mOpSys_PPC_LYNX
:
case
pwr_mOpSys_CustomBuild
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment