Skip to content

Commit

Permalink
netbeans configuration auto changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel Kraynyukhov committed Jun 25, 2018
1 parent f9edec2 commit fccbbfe
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions nbproject/Makefile-Debug.mk
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ FFLAGS=
ASFLAGS=

# Link Libraries and Options
LDLIBSOPTIONS=-L/usr/local/lib -L../libressl/lib -L/opt/gperftools/lib ../ITCFramework/dist/Debug/GNU-Linux/libitcframework.a ../ITCLib/dist/Debug/GNU-Linux/libitclib.a ../utils/dist/Debug/GNU-Linux/libutils.a
LDLIBSOPTIONS=-L/usr/local/lib -L../libressl/lib ../ITCFramework/dist/Debug/GNU-Linux/libitcframework.a ../ITCLib/dist/Debug/GNU-Linux/libitclib.a ../utils/dist/Debug/GNU-Linux/libutils.a

# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
Expand All @@ -67,7 +67,7 @@ ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps: ../utils/dist/Debug/GNU-Linux/

${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps: ${OBJECTFILES}
${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps ${OBJECTFILES} ${LDLIBSOPTIONS} -lcryptopp -ltls -lcrypto -lluajit-5.1 -lbz2 -lstdc++fs -lprofiler
g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/lapps ${OBJECTFILES} ${LDLIBSOPTIONS} -lcryptopp -ltls -lcrypto -lluajit-5.1 -lbz2 -lstdc++fs

${OBJECTDIR}/src/getLog.o: src/getLog.cpp nbproject/Makefile-${CND_CONF}.mk
${MKDIR} -p ${OBJECTDIR}/src
Expand Down
14 changes: 12 additions & 2 deletions nbproject/configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<itemPath>include/modules/bcast.h</itemPath>
<itemPath>include/modules/nap.h</itemPath>
<itemPath>include/modules/nljson.h</itemPath>
<itemPath>src/pam_auth.h</itemPath>
<itemPath>include/modules/wsSend.h</itemPath>
</logicalFolder>
<itemPath>include/Application.h</itemPath>
Expand Down Expand Up @@ -130,7 +131,6 @@
<linkerAddLib>
<pElem>/usr/local/lib</pElem>
<pElem>../libressl/lib</pElem>
<pElem>/opt/gperftools/lib</pElem>
</linkerAddLib>
<commandlineTool>g++ -pipe -Wall -pthread -O2 -mtune=native -march=native -fPIC -fstack-check -fstack-protector-strong -mfpmath=sse -msse2avx -ftree-vectorize -funroll-loops</commandlineTool>
<linkerLibItems>
Expand Down Expand Up @@ -171,7 +171,7 @@
</makeArtifact>
</linkerLibProjectItem>
</linkerLibItems>
<commandLine>-lcryptopp -ltls -lcrypto -lluajit-5.1 -lbz2 -lstdc++fs -lprofiler</commandLine>
<commandLine>-lcryptopp -ltls -lcrypto -lluajit-5.1 -lbz2 -lstdc++fs</commandLine>
</linkerTool>
<requiredProjects>
<makeArtifact PL="../utils"
Expand Down Expand Up @@ -617,6 +617,12 @@
perm="755"
owner="root"
group="bin"/>
<packFileListElem type="File"
to="${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}"
from="${OUTPUT_PATH}"
perm="755"
owner="root"
group="bin"/>
</packFileList>
<packInfoList>
<packInfoListElem name="Package" value="lapps" mandatory="true"/>
Expand Down Expand Up @@ -718,6 +724,8 @@
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/pam_auth.h" ex="false" tool="3" flavor2="0">
</item>
</conf>
<conf name="Release" type="1">
<toolsSet>
Expand Down Expand Up @@ -831,6 +839,8 @@
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/pam_auth.h" ex="false" tool="3" flavor2="0">
</item>
</conf>
</confs>
</configurationDescriptor>
2 changes: 1 addition & 1 deletion nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sun Dec 17 02:59:11 ALMT 2017
#Mon Jun 25 16:17:59 ALMT 2018
project.license=gpl30

0 comments on commit fccbbfe

Please # to comment.