Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
picsimlab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
picsimlab
Commits
417dde42
Commit
417dde42
authored
Aug 03, 2020
by
lcgamboa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chg: makefile updated !minor
parent
8d9e3bbf
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
3 deletions
+10
-3
src/Makefile
src/Makefile
+1
-1
src/Makefile.Common
src/Makefile.Common
+2
-1
src/Makefile.JS
src/Makefile.JS
+1
-0
src/Makefile.JSMT
src/Makefile.JSMT
+1
-0
src/Makefile.SDL2
src/Makefile.SDL2
+1
-0
src/Makefile.X11
src/Makefile.X11
+1
-1
src/Makefile.cross
src/Makefile.cross
+1
-0
src/Makefile.cross_32
src/Makefile.cross_32
+1
-0
src/Makefile.static
src/Makefile.static
+1
-0
No files found.
src/Makefile
View file @
417dde42
...
...
@@ -19,7 +19,7 @@ override CFLAGS+= -DEXT_BROWSER
#override CFLAGS+=-fsanitize=address
LIBS
=
`
lxrad-config
--libs
`
-lpicsim
-lsimavr
-lelf
LIBS
+=
../../ucsim-0.6/libucsim.a
LIBS
+=
$(ELIBS)
#LIBS= ../../picsim/src/libpicsim_dbg.a ../../LXRAD_WX/libteste/liblxrad.a ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a\
-lopenal
`wx-config
--libs`
`wx-config
--libs
stc`
...
...
src/Makefile.Common
View file @
417dde42
...
...
@@ -25,7 +25,8 @@ OBJS_EXP = boards/board_MPLAB_Xpress.o boards/board_Curiosity.o boards/board_x.
exp
:
OBJS+=$(OBJS_EXP)
exp
:
EFLAGS=-D_EXPERIMENTAL_
exp
:
ELIBS= ../../ucsim-0.6/libucsim.a
exp
:
$(OBJS_EXP) all
override
CFLAGS
+=
$(EFLAGS)
-DEXT_BROWSER_EXAMPLES
-DLEGACY081
src/Makefile.JS
View file @
417dde42
...
...
@@ -32,6 +32,7 @@ CFLAGS+= -D_NOTHREAD
LIBS= ../../LXRAD_SDL2/lib/liblxrad_SDL2_js.a ../../picsim/src/libpicsim_js.a ../../simavr/simavr/obj-wasm32-unknown-emscripten/libsimavr.a
LIBS+= ../../LXRAD_SDL2/teste/zlib-master/contrib/minizip/minizip.a
LIBS+= $(ELIBS)
#LIBS = `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf
...
...
src/Makefile.JSMT
View file @
417dde42
...
...
@@ -31,6 +31,7 @@ override CFLAGS+= -s WASM=1 -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1
LIBS
=
../../LXRAD_SDL2/lib/liblxrad_SDL2_js_mt.a ../../picsim/src/libpicsim_js_mt.a ../../simavr/simavr/obj-wasm32-unknown-emscripten_mt/libsimavr_mt.a
LIBS
+=
../../LXRAD_SDL2/teste/zlib-master/contrib/minizip/minizip_mt.a
LIBS
+=
$(ELIBS)
#LIBS = `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf
...
...
src/Makefile.SDL2
View file @
417dde42
...
...
@@ -20,6 +20,7 @@ override CFLAGS+=-fsanitize=address
override
CFLAGS
+=
-D_NOTHREAD
LIBS
=
`
lxrad_SDL2-config
--libs
`
-lpicsim
-lsimavr
-lelf
-lminizip
LIBS
+=
$(ELIBS)
#lxrad automatic generated block end, don't edit above!
...
...
src/Makefile.X11
View file @
417dde42
...
...
@@ -22,7 +22,7 @@ override CFLAGS += -DEXT_BROWSER -D_VERSION_=\"${VERSION}\" -Wall -ggdb -D_SHARE
#LIBS = `lxrad_X11-config --libs` -lpicsim -lsimavr -lelf -lminizip
LIBS
=
`
lxrad_X11-config
--libs
`
../../picsim/src/libpicsim_dbg.a ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a
-lelf
-lminizip
LIBS
+=
../../ucsim-0.6/libucsim.a
LIBS
+=
$(ELIBS)
#lxrad automatic generated block end, don't edit above!
...
...
src/Makefile.cross
View file @
417dde42
...
...
@@ -10,6 +10,7 @@ override CFLAGS+=-I../dev_w64/lib/wx/include/x86_64-w64-mingw32-msw-unicode-3.1
LIBS
=
-llxrad
-lOpenAL32
-lpicsim
-lsimavr
-lws2_32
-L
../dev_w64/lib
LIBS
+=
-Wl
,--subsystem,windows
-mwindows
-lwx_mswu_xrc-3
.1-x86_64-w64-mingw32
-lwx_mswu_html-3
.1-x86_64-w64-mingw32
-lwx_mswu_qa-3
.1-x86_64-w64-mingw32
-lwx_mswu_core-3
.1-x86_64-w64-mingw32
-lwx_baseu_xml-3
.1-x86_64-w64-mingw32
-lwx_baseu_net-3
.1-x86_64-w64-mingw32
-lwx_baseu-3
.1-x86_64-w64-mingw32
LIBS
+=
$(ELIBS)
#LIBS+=`x86_64-w64-mingw32-msw-unicode-3.1 --libs`
...
...
src/Makefile.cross_32
View file @
417dde42
...
...
@@ -11,6 +11,7 @@ override CFLAGS+= -I../dev_w32/lib/wx/include/i686-w64-mingw32-msw-unicode-3.1 -
LIBS
=
-llxrad
-lOpenAL32
-lpicsim
-lsimavr
-lws2_32
-L
../dev_w32/lib
LIBS
+=
-Wl
,--subsystem,windows
-mwindows
-lwx_mswu_xrc-3
.1-i686-w64-mingw32
-lwx_mswu_html-3
.1-i686-w64-mingw32
-lwx_mswu_qa-3
.1-i686-w64-mingw32
-lwx_mswu_core-3
.1-i686-w64-mingw32
-lwx_baseu_xml-3
.1-i686-w64-mingw32
-lwx_baseu_net-3
.1-i686-w64-mingw32
-lwx_baseu-3
.1-i686-w64-mingw32
LIBS
+=
$(ELIBS)
#LIBS+=`i686-w64-mingw32-msw-unicode-3.1 --libs`
all
:
$(OBJS)
...
...
src/Makefile.static
View file @
417dde42
...
...
@@ -21,6 +21,7 @@ override CFLAGS+= -DEXT_BROWSER
LIBS
=
../../picsim/src/libpicsim.a ../../lxrad/lib/liblxrad.a
\
../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a
\
-lopenal
`
wx-config
--libs
`
`
wx-config
--libs
stc
`
LIBS
+=
$(ELIBS)
#lxrad automatic generated block end, don't edit above!
...
...
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