Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
ee6a9c8b
Commit
ee6a9c8b
authored
Jul 31, 2013
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make previous check in compile correctly on linux.
git-svn-id:
https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22568
e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent
2b07c7e7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
BuildLinux.sh
BuildLinux.sh
+1
-1
Makefile
StandAlone/Makefile
+3
-4
StandAlone.cpp
StandAlone/StandAlone.cpp
+5
-1
Worklist.h
StandAlone/Worklist.h
+1
-0
osinclude.h
glslang/OSDependent/Linux/osinclude.h
+0
-2
No files found.
BuildLinux.sh
View file @
ee6a9c8b
#! /bin/bash
#! /bin/bash
rm
StandAlone/StandAlone
rm
-f
StandAlone/StandAlone
# build the StandAlone app and all it's dependencies
# build the StandAlone app and all it's dependencies
make
-C
StandAlone
make
-C
StandAlone
...
...
StandAlone/Makefile
View file @
ee6a9c8b
...
@@ -10,14 +10,13 @@ default: all
...
@@ -10,14 +10,13 @@ default: all
all
:
StandAlone
all
:
StandAlone
StandAlone
:
$(TARGETOBJECT) SHAREDOBJECT
StandAlone
:
$(TARGETOBJECT) SHAREDOBJECT
$(CC)
-g
-o
$@
$(TARGETOBJECT)
-L
$(LIBPATH)
-lglslang
-lpthread
\
$(CC)
-g
-o
$@
$(TARGETOBJECT)
-L
$(LIBPATH)
-lglslang
-lpthread
-lm
-lstdc
++
-lm
-lstdc
++
SHAREDOBJECT
:
SHAREDOBJECT
:
cd
$(OBJECTPATH)
;
make all
cd
$(OBJECTPATH)
;
make all
%.o
:
%.cpp
%.o
:
%.cpp
$(CC)
-g
-c
$<
$(CC)
-g
-c
-I
../glslang/OSDependent/Linux
$<
#
#
# Cleanup
# Cleanup
...
@@ -37,4 +36,4 @@ StandAlone.o: ./../glslang/Public/ShaderLang.h
...
@@ -37,4 +36,4 @@ StandAlone.o: ./../glslang/Public/ShaderLang.h
StandAlone.o
:
./../glslang/Include/InfoSink.h ./../glslang/Include/Common.h
StandAlone.o
:
./../glslang/Include/InfoSink.h ./../glslang/Include/Common.h
StandAlone.o
:
./../glslang/Include/PoolAlloc.h
StandAlone.o
:
./../glslang/Include/PoolAlloc.h
StandAlone.o
:
./../glslang/Public/ShaderLang.h
StandAlone.o
:
./../glslang/Public/ShaderLang.h
StandAlone.o
:
Worklist.h
StandAlone/StandAlone.cpp
View file @
ee6a9c8b
...
@@ -149,7 +149,11 @@ bool ProcessArguments(int argc, char* argv[])
...
@@ -149,7 +149,11 @@ bool ProcessArguments(int argc, char* argv[])
}
}
// Thread entry point
// Thread entry point
unsigned
int
__stdcall
CompileShaders
(
void
*
)
unsigned
int
#ifdef _WIN32
__stdcall
#endif
CompileShaders
(
void
*
)
{
{
ShHandle
compiler
;
ShHandle
compiler
;
...
...
StandAlone/Worklist.h
View file @
ee6a9c8b
...
@@ -36,6 +36,7 @@
...
@@ -36,6 +36,7 @@
#define WORKLIST_H_INCLUDED
#define WORKLIST_H_INCLUDED
#include "osinclude.h"
#include "osinclude.h"
#include <string>
#include <list>
#include <list>
namespace
glslang
{
namespace
glslang
{
...
...
glslang/OSDependent/Linux/osinclude.h
View file @
ee6a9c8b
...
@@ -43,8 +43,6 @@
...
@@ -43,8 +43,6 @@
#include <semaphore.h>
#include <semaphore.h>
#include <assert.h>
#include <assert.h>
#include <errno.h>
#include <errno.h>
#include "Include/InitializeGlobals.h"
#include "Include/PoolAlloc.h"
#define _vsnprintf vsnprintf
#define _vsnprintf vsnprintf
...
...
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